New Resource: Autoscale Settings #1140

YuriyKishchenko · 2018-04-19T12:48:11Z

Updated existing closed PR #135 by @whiskeyjay to build with latest terraform azurerm provider code

(Fixes #50)

JunyiYi

Thanks @YuriyKischenko for your valuable contribution. I have commented on your code changes, please take a look.

JunyiYi · 2018-05-15T20:44:25Z

azurerm/config.go

@@ -469,6 +472,12 @@ func (c *ArmClient) registerCosmosDBClients(endpoint, subscriptionId string, aut
 }

 func (c *ArmClient) registerComputeClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
+	autoscaleSettingsClient := insights.NewAutoscaleSettingsClientWithBaseURI(endpoint, subscriptionId)
+	setUserAgent(&autoscaleSettingsClient.Client)


It would be better to use c.configureClient(&autoscaleSettingsClient.Client, auth) here

JunyiYi · 2018-05-15T20:45:07Z

azurerm/config.go

@@ -469,6 +472,12 @@ func (c *ArmClient) registerCosmosDBClients(endpoint, subscriptionId string, aut
 }

 func (c *ArmClient) registerComputeClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
+	autoscaleSettingsClient := insights.NewAutoscaleSettingsClientWithBaseURI(endpoint, subscriptionId)


This is a monitoring related API, why not put it into the registerMonitorClients?

JunyiYi · 2018-05-15T20:47:27Z

azurerm/resource_arm_autoscale_setting.go

+	"sort"
+	"strconv"
+	"time"
+


Remove these empty lines by running make fmt before commit to the repository.

JunyiYi · 2018-05-15T20:48:54Z

azurerm/resource_arm_autoscale_setting.go

+				Required: true,
+				ForceNew: true,
+			},
+			"resource_group_name": {


Function resourceGroupNameSchema() could be used here.

JunyiYi · 2018-05-15T20:52:42Z

azurerm/resource_arm_autoscale_setting.go

+									"minimum": {
+										Type:         schema.TypeInt,
+										Required:     true,
+										ValidateFunc: validation.IntBetween(1, 100),


~~Why not do validation.IntAtLeast(1)?~~ (striked out by @katbyte)

Outside of this range the azure API will return a junk error.

JunyiYi · 2018-05-15T22:26:08Z

azurerm/resource_arm_autoscale_setting.go

+		return err
+	}
+
+	d.SetId(*result.ID)


The response ID of CreateOrUpdate may not be correct (especially the casing), so we are still required to use the Get method to read the correct ID just like other resources.

JunyiYi · 2018-05-15T22:27:28Z

azurerm/resource_arm_autoscale_setting.go

+}
+
+func resourceArmAutoscaleSettingCreateOrUpdate(d *schema.ResourceData, meta interface{}) error {
+	armClient := meta.(*ArmClient)


armClient is not used anywhere else, we may change this to asClient := meta.(*ArmClient).autoscaleSettingsClient.

JunyiYi · 2018-05-15T22:30:14Z

azurerm/resource_arm_autoscale_setting.go

+	autoscaleSetting := *result.AutoscaleSetting
+	d.Set("name", result.Name)
+	d.Set("resource_group_name", resGroup)
+	d.Set("location", result.Location)


Set the location in a standard way like the one in redis cache.

JunyiYi · 2018-05-15T22:31:24Z

azurerm/resource_arm_autoscale_setting.go

+
+func resourceArmAutoscaleSettingDelete(d *schema.ResourceData, meta interface{}) error {
+	armClient := meta.(*ArmClient)
+	asClient := armClient.autoscaleSettingsClient


Simplify the two lines above to: asClient := meta.(*ArmClient).autoscaleSettingsClient

JunyiYi · 2018-05-15T22:34:18Z

azurerm/resource_arm_autoscale_setting.go

+		recurrence, recurrenceErr := expandAzureRmAutoscaleRecurrence(profile)
+
+		if fixedDate != nil && recurrence != nil {
+			return nil, fmt.Errorf("Conflict between fixed_date and reucrrence in profile %s", profileName)


This logic could be simplified to the schema definition. Take storage blob as an example.

YuriyKishchenko · 2018-05-24T15:34:26Z

Merged requested changes except update of expandAzureRmAutoscaleProfile

JunyiYi

Thanks @YuriyKischenko for the update. Basically the code looks good to me, and just some small changes need to be made (for example the test location).

JunyiYi · 2018-06-01T05:37:25Z

azurerm/resource_arm_autoscale_setting.go

+															"Friday",
+															"Saturday",
+															"Sunday",
+														}, true),


Is it case sensitive? If not, we may add DiffSuppressFunc: ignoreCaseDiffSuppressFunc here.

I agree, this needs to be a case insensitive check.

JunyiYi · 2018-06-01T05:39:56Z

azurerm/resource_arm_autoscale_setting.go

+
+	read, err := asClient.Get(ctx, resourceGroupName, name)
+	if err != nil {
+		return err


minor It would be better to be consistent with other error message (for example, including resource group name in the message).

JunyiYi · 2018-06-01T05:44:21Z

azurerm/resource_arm_autoscale_setting.go

+	"strings"
+	"time"
+
+	"github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2017-05-01-preview/insights"


Suggestion @tombuildsstuff @katbyte This package seems to be deprecated by Azure Go SDK team. Can we use the new one instead?

JunyiYi · 2018-06-01T05:50:08Z

azurerm/resource_arm_autoscale_setting.go

+
+func listTimeZoneNames() []string {
+	return []string{
+		"Dateline Standard Time", "UTC-11", "Hawaiian Standard Time", "Alaskan Standard Time",


Could you please provide the source of this list?

JunyiYi · 2018-06-01T05:53:23Z

azurerm/resource_arm_autoscale_setting_test.go

+
+    resource "azurerm_resource_group" "test" {
+      name     = "acctas%d"
+      location = "West US"


Typically we don't hard code location in test cases (because we will pass it as an environment variable). Take this as an example.

JunyiYi · 2018-06-18T22:22:27Z

Hi @YuriyKischenko , as you have not responded for more than two weeks, I would like to commit directly to your repository.

YuriyKishchenko · 2018-06-28T18:12:55Z

Hi @JunyiYi
Sorry for the delay, I have limited access to internet.
How I can help you?

JunyiYi · 2018-06-30T02:30:57Z

Thanks @YuriyKischenko . I will just push code into your branch. So please just make sure the branch exists, and keep this PR open.

YuriyKishchenko · 2018-06-30T08:14:51Z

Added @JunyiYi as a collaborator

I'm going to contribute to the repository myself.

WodansSon

Thanks for the PR @YuriyKischenko and the updates @JunyiYi. I took a look at it and left some comments inline.

WodansSon · 2018-07-16T22:10:44Z

azurerm/resource_arm_autoscale_setting.go

+							},
+						},
+						"fixed_date": {
+							Type:          schema.TypeSet,


Shouldn't this be a List instead of a Set?

WodansSon · 2018-07-16T22:11:04Z

azurerm/resource_arm_autoscale_setting.go

+							Set: resourceAzureRmAutoscaleDefaultHash,
+						},
+						"recurrence": {
+							Type:          schema.TypeSet,


Same as above, Shouldn't this be a List instead of a Set?

WodansSon · 2018-07-16T22:14:31Z

azurerm/resource_arm_autoscale_setting.go

+															"Friday",
+															"Saturday",
+															"Sunday",
+														}, true),


I agree, this needs to be a case insensitive check.

WodansSon · 2018-07-16T22:16:24Z

azurerm/resource_arm_autoscale_setting.go

+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"email": {
+							Type:     schema.TypeSet,


Shouldn't this be a List instead of a Set?

WodansSon · 2018-07-16T22:16:44Z

azurerm/resource_arm_autoscale_setting.go

+							Set: resourceAzureRmAutoscaleDefaultHash,
+						},
+						"webhook": {
+							Type:     schema.TypeSet,


Same here, Shouldn't this be a List instead of a Set?

WodansSon · 2018-07-16T22:51:38Z

azurerm/resource_arm_autoscale_setting.go

+	schedule["time_zone"] = *recurrence.Schedule.TimeZone
+
+	days := make([]interface{}, len(*recurrence.Schedule.Days))
+	for k, v := range *recurrence.Schedule.Days {


Can we change this to i, v and add nil checking?

WodansSon · 2018-07-16T22:55:21Z

azurerm/resource_arm_autoscale_setting.go

+	schedule["hours"] = hours
+
+	minutes := make([]interface{}, len(*recurrence.Schedule.Minutes))
+	for k, v := range *recurrence.Schedule.Minutes {


And here... Can we change this to i, v and add nil checking?

WodansSon · 2018-07-16T22:55:26Z

azurerm/resource_arm_autoscale_setting.go

+	schedule["days"] = days
+
+	hours := make([]interface{}, len(*recurrence.Schedule.Hours))
+	for k, v := range *recurrence.Schedule.Hours {


Same here... Can we change this to i, v and add nil checking?

WodansSon · 2018-07-16T23:04:15Z

website/docs/r/autoscale_setting.html.markdown

+
+# azurerm\_autoscale\_setting
+
+Create an [autoscale setting](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-overview-autoscale) that can be 


Can we change this from Create an to Manage a here?

WodansSon · 2018-07-16T23:09:46Z

website/docs/r/autoscale_setting.html.markdown

+
+* `default` - (Required) Specifies the number of instances that are available for scaling if metrics are not available for 
+evaluation. The default is only used if the current instance count is lower than the default.
+


Can you add a HR between this section and all of the following sections as well?

---

WodansSon

Oops, I accidentally clicked the wrong radio button on my previous review.

tombuildsstuff · 2018-07-19T14:19:09Z

@JunyiYi we're looking to ship this as part of v1.10 of the Provider this week - as such I'm going to pick this up (I hope you don't mind!).

Looking at the changes made I'm going to have to revert a couple of commits you've made (in particular the timezone refactoring [since this could potentially break the VM resource] and the moving to a deprecated SDK [Preview services not in the Preview folder are deprecated]) which will allow us to fix the remaining issues / allow us to ship this.

Thanks!

…quency` since it needs defaulting

Tests pass: ``` $ acctests azurerm TestAccAzureRMAutoScaleSetting_multipleProfiles === RUN TestAccAzureRMAutoScaleSetting_multipleProfiles --- PASS: TestAccAzureRMAutoScaleSetting_multipleProfiles (410.92s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 411.254s ```

tombuildsstuff

this now LGTM with the refactoring 👍

outdated

tombuildsstuff · 2018-07-20T17:14:30Z

Tests pass:

tombuildsstuff · 2018-07-20T17:18:26Z

@YuriyKischenko thanks for this PR - I hope you don't mind us finishing it off, but this'll ship as a part of v1.10 :)

ghost · 2020-03-30T15:15:37Z

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!

tombuildsstuff added new-resource service/monitor labels May 4, 2018

JunyiYi mentioned this pull request May 15, 2018

Feature Request: Auto Scale Settings #50

Closed

JunyiYi suggested changes May 15, 2018

View reviewed changes

JunyiYi requested review from JunyiYi, tombuildsstuff and metacpp and removed request for JunyiYi May 15, 2018 23:02

JunyiYi self-assigned this May 15, 2018

This comment has been minimized.

Sign in to view

tombuildsstuff unassigned JunyiYi May 24, 2018

JunyiYi previously requested changes Jun 1, 2018

View reviewed changes

metacpp assigned JunyiYi Jun 5, 2018

katbyte added the waiting-response label Jun 6, 2018

tombuildsstuff mentioned this pull request Jun 29, 2018

New Resource: Autoscale Settings #135

Closed

JunyiYi changed the title ~~New Resource: Autoscale Settings~~ [WIP] New Resource: Autoscale Settings Jul 11, 2018

JunyiYi removed the waiting-response label Jul 11, 2018

katbyte changed the title ~~[WIP] New Resource: Autoscale Settings~~ New Resource: Autoscale Settings Jul 16, 2018

WodansSon reviewed Jul 16, 2018

View reviewed changes

WodansSon previously requested changes Jul 16, 2018

View reviewed changes

tombuildsstuff added this to the 1.10.0 milestone Jul 19, 2018

tombuildsstuff assigned tombuildsstuff and unassigned JunyiYi Jul 19, 2018

YuriyKishchenko and others added 15 commits July 20, 2018 17:30

update to build with latest terraform provider code

9b4edff

update tests

2cba463

follow up

7bd76ca

fixes for notification operation and scale value int to string

67562b9

Update to the newer SDK types.

a3b2d6b

Add autoscale setting to the provider.

a4518e6

Fix the coding style of test cases.

26a0780

Fix styles of resource definition code.

6b47fce

Initial refactoring to remove crashes

19e678e

Moving to the undeprecated SDK

a1cc23e

Refactoring to avoid crashes / ensure fields are always set

687af34

time_zone -> timezone to match the other resources. Removing `fre…

d076b83

…quency` since it needs defaulting

Rewriting the documentation / fixing making the highlights consistent

1745128

Removing a remnant of the frequency field

c1234a2

Setting custom_emails correctly / defaulting timezones to UTC

81b72f1

tombuildsstuff force-pushed the autoscale branch from a74bbcd to 81b72f1 Compare July 20, 2018 15:43

tombuildsstuff added 2 commits July 20, 2018 18:48

Monitoring -> Monitor

ed1b9a4

tombuildsstuff approved these changes Jul 20, 2018

View reviewed changes

Linking to the timezone list

a861efb

paultyng approved these changes Jul 20, 2018

View reviewed changes

tombuildsstuff merged commit 7acd9d7 into hashicorp:master Jul 20, 2018

tombuildsstuff added a commit that referenced this pull request Jul 20, 2018

Updating to include #1140

b2816f6

gregjhogan mentioned this pull request Aug 2, 2018

VMSS ignore capacity #1341

Closed

hashicorp locked and limited conversation to collaborators Mar 30, 2020

YuriyKishchenko deleted the autoscale branch March 30, 2020 15:20


		# azurerm\_autoscale\_setting

		Create an [autoscale setting](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-overview-autoscale) that can be


		* `default` - (Required) Specifies the number of instances that are available for scaling if metrics are not available for
		evaluation. The default is only used if the current instance count is lower than the default.

New Resource: Autoscale Settings #1140

New Resource: Autoscale Settings #1140

Conversation

YuriyKishchenko commented Apr 19, 2018 • edited by katbyte

JunyiYi 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

JunyiYi May 15, 2018 • edited by katbyte

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

This comment has been minimized.

YuriyKishchenko commented May 24, 2018

JunyiYi 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

JunyiYi commented Jun 18, 2018 • edited

YuriyKishchenko commented Jun 28, 2018

JunyiYi commented Jun 30, 2018

YuriyKishchenko commented Jun 30, 2018

WodansSon 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

WodansSon left a comment

Choose a reason for hiding this comment

tombuildsstuff commented Jul 19, 2018

tombuildsstuff left a comment

Choose a reason for hiding this comment

tombuildsstuff commented Jul 20, 2018

tombuildsstuff commented Jul 20, 2018

ghost commented Mar 30, 2020

YuriyKishchenko commented Apr 19, 2018 •

edited by katbyte

JunyiYi May 15, 2018 •

edited by katbyte

JunyiYi commented Jun 18, 2018 •

edited