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

azurerm_kubernetes_cluster - support for the cost_analysis_enabled property #26052

Merged
merged 5 commits into from
May 30, 2024

Conversation

ms-henglu
Copy link
Contributor

@ms-henglu ms-henglu commented May 22, 2024

fixes #23982

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

The failed tests are not related to this change.
image

=== RUN   TestAccKubernetesCluster_costAnalysisEnabled
=== PAUSE TestAccKubernetesCluster_costAnalysisEnabled
=== CONT  TestAccKubernetesCluster_costAnalysisEnabled
--- PASS: TestAccKubernetesCluster_costAnalysisEnabled (1387.34s)
PASS

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

  • azurerm_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #0000

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

@ms-henglu ms-henglu marked this pull request as ready for review May 22, 2024 08:22
@ms-henglu ms-henglu changed the title azurerm_kubernetes_cluster - support for the cost_analysis_enabled property [WIP]azurerm_kubernetes_cluster - support for the cost_analysis_enabled property May 22, 2024
@ms-henglu ms-henglu changed the title [WIP]azurerm_kubernetes_cluster - support for the cost_analysis_enabled property azurerm_kubernetes_cluster - support for the cost_analysis_enabled property May 23, 2024
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @ms-henglu. Overall this looks fine, please take a look at the two suggestions left in-line. This should be good to go once they're resolved.

Comment on lines 1151 to 1193
func TestAccKubernetesCluster_costAnalysisEnabled(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccKubernetesCluster_costAnalysis(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.costAnalysisEnabled(data, false),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, false),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for being thorough with the tests here @ms-henglu, but I think we consolidate these into one test by toggling from true -> false -> true. This way we're testing the initial creation of a resource with cost analysis enabled, and then that we can toggle this. I don't think it's necessary to explicitly test the default value false at creation since every other test where we're not specifying cost_analysis_enabled will be checking this.

Suggested change
func TestAccKubernetesCluster_costAnalysisEnabled(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}
func TestAccKubernetesCluster_costAnalysis(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.costAnalysisEnabled(data, false),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, false),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}
func TestAccKubernetesCluster_costAnalysis(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, false),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.costAnalysisEnabled(data, true),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

@@ -99,6 +99,8 @@ In addition, one of either `identity` or `service_principal` blocks must be spec

* `confidential_computing` - (Optional) A `confidential_computing` block as defined below. For more details please [the documentation](https://learn.microsoft.com/en-us/azure/confidential-computing/confidential-nodes-aks-overview)

* `cost_analysis_enabled` - (Optional) Should cost analysis be enabled for this Kubernetes Cluster? Defaults to `false`. The `sku_tier` must be set to `Standard` or `Premium` to enable this feature. Enabling this will add Kubernetes Namespace and Deployment details to the Cost Analysis views in the Azure portal.
Copy link
Member

Choose a reason for hiding this comment

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

The sku_tier must be set to Standard or Premium to enable this feature.

Can we add this validation into the code as well?

@ms-henglu
Copy link
Contributor Author

Thanks @stephybun for the code review. I've updated this Pr as suggested. Please take another look, thanks!

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

We have a test failure:

------- Stdout: -------
=== RUN   TestAccKubernetesCluster_costAnalysis
=== PAUSE TestAccKubernetesCluster_costAnalysis
=== CONT  TestAccKubernetesCluster_costAnalysis
   testcase.go:113: Step 3/6 error: After applying this test step, the plan was not empty.
       stdout:
       Terraform used the selected providers to generate the following execution
       plan. Resource actions are indicated with the following symbols:
         ~ update in-place
       Terraform will perform the following actions:
         # azurerm_kubernetes_cluster.test will be updated in-place
         ~ resource "azurerm_kubernetes_cluster" "test" {
             ~ cost_analysis_enabled               = true -> false
               id                                  = "/subscriptions/*******/resourceGroups/acctestRG-aks-240530064851694058/providers/Microsoft.ContainerService/managedClusters/acctestaks240530064851694058"
               name                                = "acctestaks240530064851694058"
               tags                                = {}
               # (27 unchanged attributes hidden)
               # (4 unchanged blocks hidden)
           }
       Plan: 0 to add, 1 to change, 0 to destroy.
--- FAIL: TestAccKubernetesCluster_costAnalysis (759.53s)
FAIL```

@ms-henglu
Copy link
Contributor Author

Thanks @stephybun , I've fixed the typo:

=== RUN   TestAccKubernetesCluster_costAnalysis
=== PAUSE TestAccKubernetesCluster_costAnalysis
=== CONT  TestAccKubernetesCluster_costAnalysis
--- PASS: TestAccKubernetesCluster_costAnalysis (1362.21s)
PASS

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @ms-henglu LGTM 👍

@stephybun stephybun merged commit be361dc into hashicorp:main May 30, 2024
33 checks passed
@github-actions github-actions bot added this to the v3.106.0 milestone May 30, 2024
stephybun added a commit that referenced this pull request May 30, 2024
Copy link

github-actions bot commented Jul 1, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Azure Kubernetes Service cost analysis
2 participants