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_log_analytics_workspace - support for the identity property #23864

Merged

Conversation

ziyeqf
Copy link
Contributor

@ziyeqf ziyeqf commented Nov 10, 2023

test

 tftest loganalytics TestAccLogAnalyticsWorkspace           
=== RUN   TestAccLogAnalyticsWorkspace_basic
=== PAUSE TestAccLogAnalyticsWorkspace_basic
=== RUN   TestAccLogAnalyticsWorkspace_requiresImport
=== PAUSE TestAccLogAnalyticsWorkspace_requiresImport
=== RUN   TestAccLogAnalyticsWorkspace_complete
=== PAUSE TestAccLogAnalyticsWorkspace_complete
=== RUN   TestAccLogAnalyticsWorkspace_freeTier
    log_analytics_workspace_resource_test.go:96: `TestAccLogAnalyticsWorkspace_freeTier` due to subscription pricing tier configuration (e.g. Pricing tier doesn't match the subscription's billing model.)
--- SKIP: TestAccLogAnalyticsWorkspace_freeTier (0.00s)
=== RUN   TestAccLogAnalyticsWorkspace_withDefaultSku
=== PAUSE TestAccLogAnalyticsWorkspace_withDefaultSku
=== RUN   TestAccLogAnalyticsWorkspace_withVolumeCap
=== PAUSE TestAccLogAnalyticsWorkspace_withVolumeCap
=== RUN   TestAccLogAnalyticsWorkspace_removeVolumeCap
=== PAUSE TestAccLogAnalyticsWorkspace_removeVolumeCap
=== RUN   TestAccLogAnalyticsWorkspace_withInternetIngestionEnabled
=== PAUSE TestAccLogAnalyticsWorkspace_withInternetIngestionEnabled
=== RUN   TestAccLogAnalyticsWorkspace_withInternetQueryEnabled
=== PAUSE TestAccLogAnalyticsWorkspace_withInternetQueryEnabled
=== RUN   TestAccLogAnalyticsWorkspace_withCapacityReservation
=== PAUSE TestAccLogAnalyticsWorkspace_withCapacityReservation
=== RUN   TestAccLogAnalyticsWorkspace_negativeOne
=== PAUSE TestAccLogAnalyticsWorkspace_negativeOne
=== RUN   TestAccLogAnalyticsWorkspace_cmkForQueryForced
=== PAUSE TestAccLogAnalyticsWorkspace_cmkForQueryForced
=== RUN   TestAccLogAnalyticsWorkspace_ToggleAllowOnlyResourcePermission
=== PAUSE TestAccLogAnalyticsWorkspace_ToggleAllowOnlyResourcePermission
=== RUN   TestAccLogAnalyticsWorkspace_ToggleDisableLocalAuth
=== PAUSE TestAccLogAnalyticsWorkspace_ToggleDisableLocalAuth
=== RUN   TestAccLogAnalyticsWorkspace_updateSku
=== PAUSE TestAccLogAnalyticsWorkspace_updateSku
=== RUN   TestAccLogAnalyticsWorkspace_withDefaultDataCollectionRule
=== PAUSE TestAccLogAnalyticsWorkspace_withDefaultDataCollectionRule
=== RUN   TestAccLogAnalyticsWorkspace_withSystemAssignedIdentity
=== PAUSE TestAccLogAnalyticsWorkspace_withSystemAssignedIdentity
=== RUN   TestAccLogAnalyticsWorkspace_withUserAssignedIdentity
=== PAUSE TestAccLogAnalyticsWorkspace_withUserAssignedIdentity
=== RUN   TestAccLogAnalyticsWorkspace_toggleIdentity
=== PAUSE TestAccLogAnalyticsWorkspace_toggleIdentity
=== CONT  TestAccLogAnalyticsWorkspace_basic
=== CONT  TestAccLogAnalyticsWorkspace_negativeOne
=== CONT  TestAccLogAnalyticsWorkspace_withDefaultDataCollectionRule
=== CONT  TestAccLogAnalyticsWorkspace_withUserAssignedIdentity
=== CONT  TestAccLogAnalyticsWorkspace_withSystemAssignedIdentity
=== CONT  TestAccLogAnalyticsWorkspace_toggleIdentity
=== CONT  TestAccLogAnalyticsWorkspace_withInternetQueryEnabled
=== CONT  TestAccLogAnalyticsWorkspace_removeVolumeCap
--- PASS: TestAccLogAnalyticsWorkspace_basic (192.66s)
=== CONT  TestAccLogAnalyticsWorkspace_withInternetIngestionEnabled
--- PASS: TestAccLogAnalyticsWorkspace_negativeOne (195.24s)
=== CONT  TestAccLogAnalyticsWorkspace_ToggleDisableLocalAuth
--- PASS: TestAccLogAnalyticsWorkspace_withSystemAssignedIdentity (196.22s)
=== CONT  TestAccLogAnalyticsWorkspace_updateSku
--- PASS: TestAccLogAnalyticsWorkspace_withUserAssignedIdentity (216.38s)
=== CONT  TestAccLogAnalyticsWorkspace_withDefaultSku
--- PASS: TestAccLogAnalyticsWorkspace_withInternetQueryEnabled (265.71s)
=== CONT  TestAccLogAnalyticsWorkspace_withVolumeCap
--- PASS: TestAccLogAnalyticsWorkspace_removeVolumeCap (265.78s)
=== CONT  TestAccLogAnalyticsWorkspace_complete
--- PASS: TestAccLogAnalyticsWorkspace_withDefaultDataCollectionRule (297.61s)
=== CONT  TestAccLogAnalyticsWorkspace_requiresImport
--- PASS: TestAccLogAnalyticsWorkspace_toggleIdentity (363.54s)
=== CONT  TestAccLogAnalyticsWorkspace_withCapacityReservation
--- PASS: TestAccLogAnalyticsWorkspace_withDefaultSku (182.84s)
=== CONT  TestAccLogAnalyticsWorkspace_ToggleAllowOnlyResourcePermission
--- PASS: TestAccLogAnalyticsWorkspace_complete (182.81s)
=== CONT  TestAccLogAnalyticsWorkspace_cmkForQueryForced
--- PASS: TestAccLogAnalyticsWorkspace_updateSku (253.42s)
--- PASS: TestAccLogAnalyticsWorkspace_withVolumeCap (186.39s)
--- PASS: TestAccLogAnalyticsWorkspace_withInternetIngestionEnabled (261.29s)
--- PASS: TestAccLogAnalyticsWorkspace_ToggleDisableLocalAuth (288.48s)
--- PASS: TestAccLogAnalyticsWorkspace_requiresImport (199.71s)
--- PASS: TestAccLogAnalyticsWorkspace_withCapacityReservation (250.26s)
--- PASS: TestAccLogAnalyticsWorkspace_ToggleAllowOnlyResourcePermission (288.89s)
--- PASS: TestAccLogAnalyticsWorkspace_cmkForQueryForced (252.90s)
PASS
ok  	github.com/hashicorp/terraform-provider-azurerm/internal/services/loganalytics	701.567s

@ziyeqf ziyeqf changed the title azurerm_log_analytics_workspace: support identity azurerm_log_analytics_workspace - support for the identity property Nov 13, 2023

An `identity` block supports the following:

* `type` - (Required) Specifies the identity type of the Function App. Possible values are `SystemAssigned` (where Azure will generate a Service Principal for you), `UserAssigned` where you can specify the Service Principal IDs in the `identity_ids` field, and `SystemAssigned, UserAssigned` which assigns both a system managed identity as well as the specified user assigned identities.
Copy link
Member

Choose a reason for hiding this comment

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

We're using the schema for System OR User Assigned so I don't think the last line on SystemAssigned, UserAssigned should be here

Suggested change
* `type` - (Required) Specifies the identity type of the Function App. Possible values are `SystemAssigned` (where Azure will generate a Service Principal for you), `UserAssigned` where you can specify the Service Principal IDs in the `identity_ids` field, and `SystemAssigned, UserAssigned` which assigns both a system managed identity as well as the specified user assigned identities.
* `type` - (Required) Specifies the identity type of the Log Analytics Workspace. Possible values are `SystemAssigned` (where Azure will generate a Service Principal for you) and `UserAssigned` where you can specify the Service Principal IDs in the `identity_ids` field.


* `type` - (Required) Specifies the identity type of the Function App. Possible values are `SystemAssigned` (where Azure will generate a Service Principal for you), `UserAssigned` where you can specify the Service Principal IDs in the `identity_ids` field, and `SystemAssigned, UserAssigned` which assigns both a system managed identity as well as the specified user assigned identities.

~> **NOTE:** When `type` is set to `SystemAssigned`, The assigned `principal_id` and `tenant_id` can be retrieved after the Function App has been created. More details are available below.
Copy link
Member

Choose a reason for hiding this comment

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

Are there more details below?

Suggested change
~> **NOTE:** When `type` is set to `SystemAssigned`, The assigned `principal_id` and `tenant_id` can be retrieved after the Function App has been created. More details are available below.
~> **NOTE:** When `type` is set to `SystemAssigned`, The assigned `principal_id` and `tenant_id` can be retrieved after the Log Analytics Workspace has been created.

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 @ziyeqf LGTM 👍

@stephybun stephybun merged commit 0302135 into hashicorp:main Nov 17, 2023
23 checks passed
@github-actions github-actions bot added this to the v3.82.0 milestone Nov 17, 2023
stephybun added a commit that referenced this pull request Nov 17, 2023
dduportal pushed a commit to jenkins-infra/azure that referenced this pull request Nov 24, 2023
<Actions>
<action
id="f410411e63aff4bb73a81c2aec1d373cf8a903e63b30dee2006b0030d8a94cc8">
        <h3>Bump Terraform `azurerm` provider version</h3>
<details
id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24">
            <summary>Update Terraform lock file</summary>
<p>&#34;hashicorp/azurerm&#34; updated from &#34;3.81.0&#34; to
&#34;3.82.0&#34; in file &#34;.terraform.lock.hcl&#34;</p>
            <details>
                <summary>3.82.0</summary>
<pre>Changelog retrieved
from:&#xA;&#x9;https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.82.0&#xA;FEATURES:&#xA;&#xA;*
New Data Source: `azurerm_monitor_workspace`
([#23928](hashicorp/terraform-provider-azurerm#23928
New Resource: `azurerm_application_load_balancer_subnet_association`
([#23628](https://github.com/hashicorp/terraform-provider-azurerm/issues/23628))&#xA;&#xA;ENHANCEMENTS:&#xA;&#xA;*
dependencies: updating to `v0.20231117.1130141` of
`github.com/hashicorp/go-azure-sdk`
([#23945](hashicorp/terraform-provider-azurerm#23945
`azurestackhci`: updating to API Version `2023-08-01`
([#23939](hashicorp/terraform-provider-azurerm#23939
`dashboard`: updating to API Version `2023-09-01`
([#23929](hashicorp/terraform-provider-azurerm#23929
`hpccache`: updating to API version `2023-05-01`
([#24005](hashicorp/terraform-provider-azurerm#24005
`mssql`: updating resources using `hashicorp/go-azure-sdk` to API
Version `2023-02-01-preview`
([#23721](hashicorp/terraform-provider-azurerm#23721
`templatespecversions`: updating to API Version `2022-02-01`
([#24007](hashicorp/terraform-provider-azurerm#24007
Data Source: `azurerm_template_spec_version` - refactoring to use
`hashicorp/go-azure-sdk`
([#24007](hashicorp/terraform-provider-azurerm#24007
`azurerm_cosmosdb_postgresql_cluster` -
`coordinator_storage_quota_in_mb` and `coordinator_vcore_count` are no
longer required for read replicas
([#23928](hashicorp/terraform-provider-azurerm#23928
`azurerm_dashboard_grafana` - `sku` can now be set to `Essential`
([#23934](hashicorp/terraform-provider-azurerm#23934
`azurerm_gallery_application_version` - add support for the
`config_file`, `package_file` and `target_region.exclude_from_latest`
properties
([#23816](hashicorp/terraform-provider-azurerm#23816
`azurerm_hdinsight_hadoop_cluster` - `script_actions` is no longer Force
New
([#23888](hashicorp/terraform-provider-azurerm#23888
`azurerm_hdinsight_hbase_cluster` - `script_actions` is no longer Force
New
([#23888](hashicorp/terraform-provider-azurerm#23888
`azurerm_hdinsight_interactive_query_cluster` - `script_actions` is no
longer Force New
([#23888](hashicorp/terraform-provider-azurerm#23888
`azurerm_hdinsight_kafka_cluster` - `script_actions` is no longer Force
New
([#23888](hashicorp/terraform-provider-azurerm#23888
`azurerm_hdinsight_spark_cluster` - `script_actions` is no longer Force
New
([#23888](hashicorp/terraform-provider-azurerm#23888
`azurerm_kubernetes_cluster` - add support for the `gpu_instance`
property
([#23887](hashicorp/terraform-provider-azurerm#23887
`azurerm_kubernetes_cluster_node_pool` - add support for the
`gpu_instance` property
([#23887](hashicorp/terraform-provider-azurerm#23887
`azurerm_log_analytics_workspace` - add support for the `identity`
property
([#23864](hashicorp/terraform-provider-azurerm#23864
`azurerm_linux_function_app` - add support for dotnet 8
([#23638](hashicorp/terraform-provider-azurerm#23638
`azurerm_linux_function_app_slot` - add support for dotnet 8
([#23638](hashicorp/terraform-provider-azurerm#23638
`azurerm_managed_lustre_file_system` - export attribute `mgs_address`
([#23942](hashicorp/terraform-provider-azurerm#23942
`azurerm_mssql_database` - support for Hyperscale SKUs
([#23974](hashicorp/terraform-provider-azurerm#23974
`azurerm_mssql_database` - refactoring to use `hashicorp/go-azure-sdk`
([#23721](hashicorp/terraform-provider-azurerm#23721
`azurerm_mssql_server` - refactoring to use `hashicorp/go-azure-sdk`
([#23721](hashicorp/terraform-provider-azurerm#23721
`azurerm_shared_image` - add support for `trusted_launch_supported`
([#23781](hashicorp/terraform-provider-azurerm#23781
`azurerm_spring_cloud_container_deployment` - add support for the
`application_performance_monitoring_ids` property
([#23862](hashicorp/terraform-provider-azurerm#23862
`azurerm_spring_cloud_customized_accelerator` - add support for the
`accelerator_type` and `path` properties
([#23797](hashicorp/terraform-provider-azurerm#23797
`azurerm_point_to_site_vpn_gateway` - allow multiple
`connection_configurations` blocks
([#23936](hashicorp/terraform-provider-azurerm#23936
`azurerm_private_dns_cname_record` - `ttl` can now be set to 0
([#23918](hashicorp/terraform-provider-azurerm#23918
`azurerm_windows_function_app` - add support for dotnet 8
([#23638](hashicorp/terraform-provider-azurerm#23638
`azurerm_windows_function_app_slot` - add support for dotnet 8
([#23638](https://github.com/hashicorp/terraform-provider-azurerm/issues/23638))&#xA;&#xA;BUG
FIXES:&#xA;* `azurerm_api_management` - correct a bug with additional
location zones within the `additional_location` block
([#23943](hashicorp/terraform-provider-azurerm#23943
`azurerm_dev_test_linux_virtual_machine` - `storage_type` is now
ForceNew to match the updated API behaviour
([#23973](hashicorp/terraform-provider-azurerm#23973
`azurerm_dev_test_windows_virtual_machine` - `storage_type` is now
ForceNew to match the updated API behaviour
([#23973](hashicorp/terraform-provider-azurerm#23973
`azurerm_disk_encryption_set` - resource will recreate if `identity`
changes from `SystemAssigned` to `UserAssigned`
([#23904](hashicorp/terraform-provider-azurerm#23904
`azurerm_eventhub_cluster`: `sku_name` is no longer ForceNew
([#24009](hashicorp/terraform-provider-azurerm#24009
`azurerm_firewall` - recasing the value for `firewall_policy_id` to
workaround the API returning the incorrect casing
([#23993](hashicorp/terraform-provider-azurerm#23993
`azurerm_security_center_subscription_pricing` - fix a bug preventing
removal of `extensions` and downgrading `tier` to `Free`
([#23821](hashicorp/terraform-provider-azurerm#23821
`azurerm_windows_web_app` - fix an issue of incorrect application stack
settings during update
([#23372](https://github.com/hashicorp/terraform-provider-azurerm/issues/23372))&#xA;&#xA;&#xA;</pre>
            </details>
        </details>
<a
href="https://infra.ci.jenkins.io/job/terraform-jobs/job/azure/job/main/896/">Jenkins
pipeline link</a>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

Co-authored-by: Jenkins Infra Bot (updatecli) <[email protected]>
Copy link

github-actions bot commented May 7, 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 May 7, 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.

2 participants