New resource & data source: azurerm_managed_application_definition #6211

neil-yechenwei · 2020-03-21T07:21:17Z

This PR is the implement of the issue #5294

magodo

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

azurerm/internal/services/managedapplication/data_source_managed_application_definition.go

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

azurerm/internal/services/managedapplication/validate/managed_application_definition_test.go

website/docs/d/managed_application_definition.html.markdown

website/docs/r/managed_application_definition.html.markdown

azurerm/internal/services/managedapplication/parse/managed_application_definition_test.go

website/allowed-subcategories

neil-yechenwei · 2020-03-25T11:00:47Z

@magodo , Thanks for your comments. I've updated code. Please have a look.

magodo

I have left some additional mostly minor comments that once addressed this should be good to merge 👍

azurerm/internal/services/managedapplication/parse/managed_application_definition_test.go

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

website/docs/d/managed_application_definition.html.markdown

azurerm/internal/services/managedapplication/validate/managed_application_definition_test.go

neil-yechenwei · 2020-03-26T06:51:21Z

@magodo , Thanks for your comments. I've updated code.

katbyte

Thanks for the PR @neil-yechenwei, overall this looks good to me with just a couple comments inline. My main concern is conditionally setting things on read, typically we always read everything in.

katbyte · 2020-03-27T01:40:58Z

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

+	}
+
+	if (parameters.CreateUIDefinition != nil && parameters.MainTemplate == nil) || (parameters.CreateUIDefinition == nil && parameters.MainTemplate != nil) {
+		return fmt.Errorf("`create_ui_definition` and `main_template` should be set or not set together")


I think saying if one is set the other must be too covers all conditions:

Suggested change

return fmt.Errorf("`create_ui_definition` and `main_template` should be set or not set together")

return fmt.Errorf("if either `create_ui_definition` or `main_template` is set the other one must be too")

could we add a note about this in the docs?

katbyte · 2020-03-27T01:42:15Z

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

+	if v, ok := d.GetOk("create_ui_definition"); ok {
+		d.Set("create_ui_definition", v.(string))
+	}
+	if v, ok := d.GetOk("main_template"); ok {
+		d.Set("main_template", v.(string))
+	}
+	if v, ok := d.GetOk("package_file_uri"); ok {
+		d.Set("package_file_uri", v.(string))
+	}


why are we conditionally setting these? typically we always read in all propertie

I've debugged code. I found create_ui_definition , main_template and package_file_uri returned nil from service side. So I have to do this.

lets add a comment in here stating that

katbyte · 2020-03-27T01:47:02Z

...ternal/services/managedapplication/tests/resource_arm_managed_application_definition_test.go

+}
+
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-managedapplication-%d"


lets go with mapp here, just a short reminder/identifier so we can spot services potentially not cleaning up after themselves

Suggested change

name = "acctestRG-managedapplication-%d"

name = "acctestRG-mapp-%d"

katbyte · 2020-03-27T01:47:59Z

website/allowed-subcategories

@@ -33,6 +33,7 @@ Load Balancer
 Log Analytics
 Logic App
 Machine Learning
+Managed Application


should this be

Suggested change

Managed Application

Managed Applications

katbyte · 2020-03-27T01:48:42Z

website/docs/r/managed_application_definition.html.markdown

+
+* `lock_level` - (Required) Specifies the managed application lock level. Valid values include `CanNotDelete`, `None`, `ReadOnly`. Changing this forces a new resource to be created.
+
+* `create_ui_definition` - (Optional) Specifies the createUiDefinition json for the backing template with Microsoft.Solutions/applications resource.


Suggested change

* `create_ui_definition` - (Optional) Specifies the createUiDefinition json for the backing template with Microsoft.Solutions/applications resource.

* `create_ui_definition` - (Optional) Specifies the `createUiDefinition` json for the backing template with `Microsoft.Solutions/applications` resource.

katbyte · 2020-03-27T01:56:26Z

website/docs/r/managed_application_definition.html.markdown

+
+* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created.
+
+* `authorization` - (Required) One or more `authorization` block defined below.


might be nice to explain what the authorization blocks correspond to. I question if authorization is the right name for the property

It is used to grant permission to the managed resource group. After checked, seems azure portal and powershell and cli all named this property as "authorization". So I think maybe we should align with them, then user is easily to understand.

azure portal:

powershell:

azure cli:

katbyte · 2020-03-27T01:56:58Z

website/docs/r/managed_application_definition.html.markdown

+
+* `description` - (Optional) Specifies the managed application definition description.
+
+* `package_enabled` - (Optional) Is enabled for this package? Defaults to `true`.


i think this needs rewording

katbyte

Hey @neil-yechenwei, thanks for the PR. I've left only a couple comments inline, and i hope you don't mind but i am going to push the required changes soi can mege this. As well as some naming convention changes we are starting to roll out (resource/datasource at the end of the file name, dropping Arm from function names)

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

katbyte · 2020-03-27T22:01:49Z

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

+
+			"location": azure.SchemaLocation(),
+
+			"lock_level": {


could we arrange these required properties alphabetically

katbyte · 2020-03-27T22:10:41Z

azurerm/internal/services/managedapplication/resource_arm_managed_application_definition.go

+	if v, ok := d.GetOk("create_ui_definition"); ok {
+		d.Set("create_ui_definition", v.(string))
+	}
+	if v, ok := d.GetOk("main_template"); ok {
+		d.Set("main_template", v.(string))
+	}
+	if v, ok := d.GetOk("package_file_uri"); ok {
+		d.Set("package_file_uri", v.(string))
+	}


lets add a comment in here stating that

ghost · 2020-04-02T23:49:45Z

This has been released in version 2.4.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.4.0"
}
# ... other configuration ...

ghost · 2020-04-27T14:50:00Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks!

neil-yechenwei added 6 commits March 20, 2020 12:52

New resource & data source: azurerm_managed_application_definition

19bc809

Update code

e71b245

Update code

aaecd26

Update code

6e820d7

Merge remote-tracking branch 'upstream/master' into managed_app_def_03

ae29cf0

Update code

286124e

ghost added size/XXL dependencies documentation labels Mar 21, 2020

magodo requested changes Mar 23, 2020

View reviewed changes

magodo reviewed Mar 24, 2020

View reviewed changes

azurerm/internal/services/managedapplication/parse/managed_application_definition_test.go Outdated Show resolved Hide resolved

Merge remote-tracking branch 'upstream/master' into managed_app_def_03

b8e13d4

magodo reviewed Mar 25, 2020

View reviewed changes

website/allowed-subcategories Outdated Show resolved Hide resolved

neil-yechenwei added 3 commits March 25, 2020 12:41

Update code

552c314

Update code

7b2bec5

Update code

e4884b7

Update code

83e7433

magodo requested changes Mar 26, 2020

View reviewed changes

Update code

f039f40

Update code

2b5cedc

katbyte requested changes Mar 27, 2020

View reviewed changes

Update code

7380570

katbyte added the service/managed-apps label Mar 27, 2020

katbyte approved these changes Mar 27, 2020

View reviewed changes

katbyte added this to the v2.4.0 milestone Mar 27, 2020

katbyte added 3 commits March 27, 2020 15:33

Address PR comments

2d06089

Merge remote-tracking branch 'origin/master' into managed_app_def_03

5757fe0

update location handling

46c9e88

make fmt

094f784

katbyte merged commit ae23b1a into hashicorp:master Mar 28, 2020

katbyte added a commit that referenced this pull request Mar 28, 2020

update CHANGELOG.md to include #6211

e64ac8b

ghost locked and limited conversation to collaborators Apr 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New resource & data source: azurerm_managed_application_definition #6211

New resource & data source: azurerm_managed_application_definition #6211

neil-yechenwei commented Mar 21, 2020

magodo left a comment

neil-yechenwei commented Mar 25, 2020

magodo left a comment

neil-yechenwei commented Mar 26, 2020

katbyte left a comment

katbyte Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020 •

edited

Loading

katbyte Mar 27, 2020

neil-yechenwei Mar 27, 2020

katbyte left a comment

katbyte Mar 27, 2020

katbyte Mar 27, 2020

ghost commented Apr 2, 2020

ghost commented Apr 27, 2020

	return fmt.Errorf("`create_ui_definition` and `main_template` should be set or not set together")
	return fmt.Errorf("if either `create_ui_definition` or `main_template` is set the other one must be too")

	name = "acctestRG-managedapplication-%d"
	name = "acctestRG-mapp-%d"


		* `lock_level` - (Required) Specifies the managed application lock level. Valid values include `CanNotDelete`, `None`, `ReadOnly`. Changing this forces a new resource to be created.

		* `create_ui_definition` - (Optional) Specifies the createUiDefinition json for the backing template with Microsoft.Solutions/applications resource.


		* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created.

		* `authorization` - (Required) One or more `authorization` block defined below.


		* `description` - (Optional) Specifies the managed application definition description.

		* `package_enabled` - (Optional) Is enabled for this package? Defaults to `true`.

New resource & data source: azurerm_managed_application_definition #6211

New resource & data source: azurerm_managed_application_definition #6211

Conversation

neil-yechenwei commented Mar 21, 2020

magodo left a comment

Choose a reason for hiding this comment

neil-yechenwei commented Mar 25, 2020

magodo left a comment

Choose a reason for hiding this comment

neil-yechenwei commented Mar 26, 2020

katbyte 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

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

neil-yechenwei Mar 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

katbyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Apr 2, 2020

ghost commented Apr 27, 2020

neil-yechenwei Mar 27, 2020 •

edited

Loading