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

Jump to bottom

azurerm_api_management_named_value - fix the non empty plan when secret is true #6834

Merged
merged 6 commits into from May 12, 2020
Merged

azurerm_api_management_named_value - fix the non empty plan when secret is true #6834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d397adc
update
May 7, 2020
d956488
r1
May 8, 2020
906379a
r1
May 9, 2020
3791bb5
Merge branch 'master' of https://github.com/terraform-providers/terra…
May 12, 2020
5b6e46a
update
May 12, 2020
7da3e21
Merge branch 'wyp-apim-namedvalue' of https://github.com/yupwei68/ter…
May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion azurerm/internal/services/apimanagement/api_management_named_value_resource.go
View file
Open in desktop
Expand Up @@ -149,7 +149,10 @@ func resourceArmApiManagementNamedValueRead(d *schema.ResourceData, meta interfa
if properties := resp.NamedValueContractProperties; properties != nil {
d.Set("display_name", properties.DisplayName)
d.Set("secret", properties.Secret)
d.Set("value", properties.Value)
// API will not return `value` when `secret` is `true`, in which case we shall not set the `value`. Refer to the issue : #6688
if properties.Secret != nil && !*properties.Secret {
d.Set("value", properties.Value)
}
d.Set("tags", properties.Tags)
}

Expand Down
16 changes: 2 additions & 14 deletions azurerm/internal/services/apimanagement/tests/api_management_named_value_resource_test.go
View file
Open in desktop
Expand Up @@ -23,10 +23,6 @@ func TestAccAzureRMAPIManagementNamedValue_basic(t *testing.T) {
Config: testAccAzureRMAPIManagementNamedValue_basic(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMAPIManagementNamedValueExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "display_name", fmt.Sprintf("TestProperty%d", data.RandomInteger)),
resource.TestCheckResourceAttr(data.ResourceName, "value", "Test Value"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.0", "tag1"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.1", "tag2"),
),
},
data.ImportStep(),
Expand All @@ -46,24 +42,16 @@ func TestAccAzureRMAPIManagementNamedValue_update(t *testing.T) {
Config: testAccAzureRMAPIManagementNamedValue_basic(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMAPIManagementNamedValueExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "display_name", fmt.Sprintf("TestProperty%d", data.RandomInteger)),
resource.TestCheckResourceAttr(data.ResourceName, "value", "Test Value"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.0", "tag1"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.1", "tag2"),
),
},
data.ImportStep(),
{
Config: testAccAzureRMAPIManagementNamedValue_update(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMAPIManagementNamedValueExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "display_name", fmt.Sprintf("TestProperty2%d", data.RandomInteger)),
resource.TestCheckResourceAttr(data.ResourceName, "value", "Test Value2"),
resource.TestCheckResourceAttr(data.ResourceName, "secret", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.0", "tag3"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.1", "tag4"),
),
},
data.ImportStep(),
data.ImportStep("value"),
},
})
}
Expand Down