new resource:`azurerm_mobile_network_attached_data_network`; new datasource: `azurerm_mobile_network_attached_data_network` #22168

ziyeqf · 2023-06-14T07:24:32Z

overall

this is the second to the last PR, we are almost there.

order | name 
0     | azurerm_mobile_network                              ✅
1     | azurerm_mobile_network_site                         ✅
1     | azurerm_mobile_network_data_network                 ✅
1     | azurerm_mobile_network_service                      ✅
1     | azurerm_mobile_network_slice                        ✅
1     | azurerm_mobile_network_sim_group                    ✅
2     | azurerm_mobile_network_packet_core_control_plane    ✅
2     | azurerm_mobile_network_sim_policy                   ✅
3     | azurerm_mobile_network_packet_core_data_plane       ✅
4     | azurerm_mobile_network_attached_data_network        <- this one
5     | azurerm_mobile_network_sim

test

❯ tftest mobilenetwork TestAccMobileNetworkAttachedDataNetwork      
=== RUN   TestAccMobileNetworkAttachedDataNetworkDataSource_basic
=== PAUSE TestAccMobileNetworkAttachedDataNetworkDataSource_basic
=== RUN   TestAccMobileNetworkAttachedDataNetwork_basic
=== PAUSE TestAccMobileNetworkAttachedDataNetwork_basic
=== RUN   TestAccMobileNetworkAttachedDataNetwork_withDataAccess
=== PAUSE TestAccMobileNetworkAttachedDataNetwork_withDataAccess
=== RUN   TestAccMobileNetworkAttachedDataNetwork_requiresImport
=== PAUSE TestAccMobileNetworkAttachedDataNetwork_requiresImport
=== RUN   TestAccMobileNetworkAttachedDataNetwork_complete
=== PAUSE TestAccMobileNetworkAttachedDataNetwork_complete
=== RUN   TestAccMobileNetworkAttachedDataNetwork_update
=== PAUSE TestAccMobileNetworkAttachedDataNetwork_update
=== CONT  TestAccMobileNetworkAttachedDataNetworkDataSource_basic
=== CONT  TestAccMobileNetworkAttachedDataNetwork_requiresImport
=== CONT  TestAccMobileNetworkAttachedDataNetwork_update
=== CONT  TestAccMobileNetworkAttachedDataNetwork_complete
=== CONT  TestAccMobileNetworkAttachedDataNetwork_withDataAccess
=== CONT  TestAccMobileNetworkAttachedDataNetwork_basic
--- PASS: TestAccMobileNetworkAttachedDataNetwork_basic (962.32s)
--- PASS: TestAccMobileNetworkAttachedDataNetwork_withDataAccess (973.70s)
--- PASS: TestAccMobileNetworkAttachedDataNetwork_complete (1081.74s)
--- PASS: TestAccMobileNetworkAttachedDataNetwork_requiresImport (1129.70s)
--- PASS: TestAccMobileNetworkAttachedDataNetworkDataSource_basic (1135.11s)
--- PASS: TestAccMobileNetworkAttachedDataNetwork_update (1177.26s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/mobilenetwork 1177.339s

…source: `azurerm_mobile_network_attached_data_network` Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

magodo

Thanks for this PR!
I've taken a look through and left some comments inline, but this is mostly looking good to me 👍

internal/services/mobilenetwork/mobile_network_attached_data_network_resource.go

internal/services/mobilenetwork/mobile_network_attached_data_network_resource_test.go

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

internal/services/mobilenetwork/mobile_network_attached_data_network_data_source.go

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

magodo · 2023-06-27T01:28:45Z

internal/services/mobilenetwork/mobile_network_attached_data_network_data_source.go

+
+func (r AttachedDataNetworkDataSource) Arguments() map[string]*pluginsdk.Schema {
+	return map[string]*pluginsdk.Schema{
+		"mobile_network_data_network_name": {


Shall we rename this to name, or do we want to rename the corresponding field in the model from Name to MobileNetworkDataNetworkName to be consistent?

This was marked resolved but I don't see any discussion or explanation, can we have some context?

On reflection, given that this needs to be the same value as the corresponding Mobile Network Data Network's name value, we should in fact use the ID for that here and extract the name from it. This ensures the value is consistent, provides additional validation, and the value can be pulled from a reference allowing an explicit dependency between the resources.

Suggested change

"mobile_network_data_network_name": {

"mobile_network_data_network_id": {

The reason to use name instead of id is the id format of azurerm_mobile_network_attached_data_network does not contain mobileNetworkName, the response/model does not contain it either... Then we cannot set the id in read func

attached_data_network_id:/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MobileNetwork/packetCoreControlPlanes/{packetCoreControlPlaneName}/packetCoreDataPlanes/{packetCoreDataPlaneName}/attachedDataNetworks/{attachedDataNetworkName}

data_network_id: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MobileNetwork/mobileNetworks/{mobileNetworkName}/dataNetworks/{dataNetworkName}

Here is the dependency between these resources, black arrow means dependency, yellow arrow means id path. As there is a N:1 relation between azurerm_mobile_network_site and azurerm_mobile_network_packet_core_control_plane, itt seems there is no way get the id of azurerm_mobile_network_data_network. WDYT?

internal/services/mobilenetwork/mobile_network_attached_data_network_resource.go

website/docs/d/mobile_network_attached_data_network.html.markdown

website/docs/r/mobile_network_attached_data_network.html.markdown

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

magodo · 2023-06-27T07:43:49Z

@ziyeqf Thanks! LGTM 👍

jackofallops

Hi @ziyeqf, thanks for this new resource and data source.

Following on from the previous review, I've added some additional comments and a recommended slight design change that should improve the user experience and make things a little more reliable and structured in user configs. If you can take a look, we can continue review.

Thanks!

jackofallops · 2023-06-20T04:38:15Z

internal/services/mobilenetwork/mobile_network_attached_data_network_data_source.go

+}
+
+func (r AttachedDataNetworkDataSource) ModelObject() interface{} {
+	return &AttachedDataNetworkModel{}


The model for the data source should be separately defined to the resource model. Whilst they can be the same, they will often contain different properties so we should always start out with a discrete struct for the data source.

jackofallops · 2023-06-20T12:20:41Z

internal/services/mobilenetwork/mobile_network_attached_data_network_resource_test.go

+			%s
+
+resource "azurerm_mobile_network_attached_data_network" "import" {
+  mobile_network_data_network_name         = azurerm_mobile_network_data_network.test.name


these values should all be taken as references from the test resource, for example:

Suggested change

mobile_network_data_network_name = azurerm_mobile_network_data_network.test.name

mobile_network_data_network_name = azurerm_mobile_network_attached_data_network.test.name

jackofallops · 2023-06-20T12:22:31Z

internal/services/mobilenetwork/mobile_network_attached_data_network_resource_test.go

+
+  depends_on = [azurerm_mobile_network_data_network.test]


The dependency is already established here by mobile_network_data_network_name .

Suggested change

depends_on = [azurerm_mobile_network_data_network.test]

jackofallops · 2023-06-20T12:23:21Z

internal/services/mobilenetwork/mobile_network_attached_data_network_resource_test.go

+
+  depends_on = [azurerm_mobile_network_data_network.test]


The dependency is already established here by mobile_network_data_network_name .

Suggested change

depends_on = [azurerm_mobile_network_data_network.test]

internal/services/mobilenetwork/mobile_network_attached_data_network_resource_test.go

jackofallops · 2023-06-28T11:08:21Z

website/docs/d/mobile_network_attached_data_network.html.markdown

+* `create` - (Defaults to 180 minutes) Used when creating the Mobile Network Attached Data Network.
+* `read` - (Defaults to 5 minutes) Used when retrieving the Mobile Network Attached Data Network.
+* `update` - (Defaults to 180 minutes) Used when updating the Mobile Network Attached Data Network.
+* `delete` - (Defaults to 180 minutes) Used when deleting the Mobile Network Attached Data Network.


This is a data source, only read timeouts apply here

Suggested change

* `create` - (Defaults to 180 minutes) Used when creating the Mobile Network Attached Data Network.

* `read` - (Defaults to 5 minutes) Used when retrieving the Mobile Network Attached Data Network.

* `update` - (Defaults to 180 minutes) Used when updating the Mobile Network Attached Data Network.

* `delete` - (Defaults to 180 minutes) Used when deleting the Mobile Network Attached Data Network.

* `read` - (Defaults to 5 minutes) Used when retrieving the Mobile Network Attached Data Network.

jackofallops · 2023-06-28T11:08:50Z

website/docs/d/mobile_network_attached_data_network.html.markdown

+
+## Import
+
+Mobile Network Attached Data Network can be imported using the `resource id`, e.g.


Imports don't apply to data sources

Suggested change

## Import

Mobile Network Attached Data Network can be imported using the `resource id`, e.g.

jackofallops · 2023-06-28T11:13:30Z

website/docs/r/mobile_network_attached_data_network.html.markdown

+    key = "value"
+  }
+
+  depends_on = [azurerm_mobile_network_data_network.example]


again, this was marked as resolved with no explanation, can we have context here?

jackofallops · 2023-06-28T11:17:10Z

internal/services/mobilenetwork/mobile_network_attached_data_network_data_source.go

+
+func (r AttachedDataNetworkDataSource) Arguments() map[string]*pluginsdk.Schema {
+	return map[string]*pluginsdk.Schema{
+		"mobile_network_data_network_name": {


On reflection, given that this needs to be the same value as the corresponding Mobile Network Data Network's name value, we should in fact use the ID for that here and extract the name from it. This ensures the value is consistent, provides additional validation, and the value can be pulled from a reference allowing an explicit dependency between the resources.

Suggested change

"mobile_network_data_network_name": {

"mobile_network_data_network_id": {

jackofallops · 2023-06-28T11:21:35Z

internal/services/mobilenetwork/mobile_network_attached_data_network_resource.go

+		"mobile_network_data_network_name": {
+			Type:         pluginsdk.TypeString,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.StringIsNotEmpty,
+		},


As above, this should be the ID of the related resource:

Suggested change

"mobile_network_data_network_name": {

Type: pluginsdk.TypeString,

Required: true,

ForceNew: true,

ValidateFunc: validation.StringIsNotEmpty,

},

"mobile_network_data_network_id": {

Type: pluginsdk.TypeString,

Required: true,

ForceNew: true,

ValidateFunc: datanetwork.ValidateDataNetworkID,

},

From this we can extract the correct name

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

ziyeqf · 2023-07-04T07:58:34Z

kindly ping for review

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

katbyte

LGTM ☎️

ziyeqf · 2023-07-20T02:13:59Z

just to confirm are we ready to merge or waiting for another look?

github-actions · 2024-05-21T02:08:51Z

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.

new resource:azurerm_mobile_network_attached_data_network; new data…

a847640

…source: `azurerm_mobile_network_attached_data_network` Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot added dependencies documentation service/mobile-network size/XL labels Jun 14, 2023

magodo requested changes Jun 19, 2023

View reviewed changes

github-actions bot added the waiting-response label Jun 19, 2023

update per comment

bc798ba

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jun 19, 2023

jackofallops added the waiting-response label Jun 19, 2023

update per comment

ae2e89a

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jun 20, 2023

katbyte assigned jackofallops Jun 20, 2023

rename network_address_port_translation_configuration

e4050fd

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot added waiting-response and removed waiting-response labels Jun 21, 2023

update per comments

66664cf

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

ziyeqf force-pushed the tengzh/mn_adn branch from bbeee6c to 66664cf Compare June 25, 2023 05:29

magodo requested changes Jun 26, 2023

View reviewed changes

github-actions bot added the waiting-response label Jun 26, 2023

update code

e616b3e

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jun 26, 2023

magodo requested changes Jun 27, 2023

View reviewed changes

github-actions bot added the waiting-response label Jun 27, 2023

update code

ee50a66

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot added waiting-response and removed waiting-response labels Jun 27, 2023

update code

22776d9

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jun 27, 2023

jackofallops requested changes Jun 28, 2023

View reviewed changes

github-actions bot added the waiting-response label Jun 28, 2023

update code

05e5221

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jun 29, 2023

ziyeqf requested a review from jackofallops July 10, 2023 02:39

ziyeqf added 2 commits July 14, 2023 10:05

Merge branch 'main' into tengzh/mn_adn

feaf426

refresh vendor

b8f6385

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot added the waiting-response label Jul 14, 2023

lint

102f052

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>

github-actions bot removed the waiting-response label Jul 14, 2023

katbyte approved these changes Jul 18, 2023

View reviewed changes

katbyte merged commit 894f503 into hashicorp:main Jul 21, 2023
23 checks passed

github-actions bot added this to the v3.66.0 milestone Jul 21, 2023

katbyte added a commit that referenced this pull request Jul 21, 2023

Update CHANGELOG.md #22168

3419813

github-actions bot locked as resolved and limited conversation to collaborators May 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

new resource:`azurerm_mobile_network_attached_data_network`; new datasource: `azurerm_mobile_network_attached_data_network` #22168

new resource:`azurerm_mobile_network_attached_data_network`; new datasource: `azurerm_mobile_network_attached_data_network` #22168

ziyeqf commented Jun 14, 2023

magodo left a comment

magodo Jun 27, 2023

jackofallops Jun 28, 2023

jackofallops Jun 28, 2023

ziyeqf Jun 29, 2023 •

edited

Loading

ziyeqf Jun 29, 2023 •

edited

Loading

magodo commented Jun 27, 2023

jackofallops left a comment

jackofallops Jun 20, 2023

jackofallops Jun 20, 2023

jackofallops Jun 20, 2023

jackofallops Jun 20, 2023

jackofallops Jun 28, 2023

jackofallops Jun 28, 2023

jackofallops Jun 28, 2023

jackofallops Jun 28, 2023

jackofallops Jun 28, 2023

ziyeqf commented Jul 4, 2023

katbyte left a comment

ziyeqf commented Jul 20, 2023

github-actions bot commented May 21, 2024

	"mobile_network_data_network_name": {
	"mobile_network_data_network_id": {

	mobile_network_data_network_name = azurerm_mobile_network_data_network.test.name
	mobile_network_data_network_name = azurerm_mobile_network_attached_data_network.test.name


		## Import

		Mobile Network Attached Data Network can be imported using the `resource id`, e.g.

new resource:azurerm_mobile_network_attached_data_network; new datasource: azurerm_mobile_network_attached_data_network #22168

new resource:azurerm_mobile_network_attached_data_network; new datasource: azurerm_mobile_network_attached_data_network #22168

Conversation

ziyeqf commented Jun 14, 2023

overall

test

magodo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ziyeqf Jun 29, 2023 • edited Loading

Choose a reason for hiding this comment

ziyeqf Jun 29, 2023 • edited Loading

Choose a reason for hiding this comment

magodo commented Jun 27, 2023

jackofallops left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ziyeqf commented Jul 4, 2023

katbyte left a comment

Choose a reason for hiding this comment

ziyeqf commented Jul 20, 2023

github-actions bot commented May 21, 2024

new resource:`azurerm_mobile_network_attached_data_network`; new datasource: `azurerm_mobile_network_attached_data_network` #22168

new resource:`azurerm_mobile_network_attached_data_network`; new datasource: `azurerm_mobile_network_attached_data_network` #22168

ziyeqf Jun 29, 2023 •

edited

Loading

ziyeqf Jun 29, 2023 •

edited

Loading