Support for Azure Batch - Account #2428

jcorioland · 2018-12-03T10:21:41Z

This PR will brings support for Azure Batch Account.
Will partially fix #2427. Needs to be merged before #2461

Azure Batch Account:

tombuildsstuff

Thanks for opening this PR - whilst I appreciate this is still a WIP I took a look through and left a few comments inline, but this is off to a good start 👍

Thanks!

tombuildsstuff · 2018-12-03T17:54:24Z

azurerm/data_source_batch_account.go

+				ValidateFunc: validation.StringInSlice([]string{
+					string(batch.BatchService),
+					string(batch.UserSubscription),
+				}, true),


I think this field should just have Type+Computed?

Hmm, I am not sure to understand why this field should be marked as Computed? It should be specified in the configuration.

Ok sorry, I was looking on the resource, not the datasource :-)

so this is specific to the Data Source where whilst this information will be returned it can't be set (since we only obtain the Batch Account using the Name & Resource Group - the other fields are outputs)

azurerm/resource_arm_batch_account.go

tombuildsstuff · 2018-12-05T17:34:21Z

@jcorioland rathe than combining multiple resources into a single PR could we split these out into two different PR's, one for the Account and one for the Pool?

jcorioland · 2018-12-06T08:10:28Z

@tombuildsstuff I was actually thinking the same to keep merge operations simple. I've created a new PR #2461 for Azure Batch pool. Not sure I did it well, tell me if I am wrong.

tombuildsstuff

hey @jcorioland

Thanks for pushing those changes - I've taken a look through and left some minor comments in-line but this is mostly looking good, if we can fix those up we should be able to run the tests and get this merged 👍

Thanks!

azurerm/data_source_batch_account.go

azurerm/resource_arm_batch_account.go

tombuildsstuff · 2018-12-10T14:32:47Z

azurerm/resource_arm_batch_account.go

+	log.Printf("[INFO] preparing arguments for Azure Batch account update.")
+
+	resourceGroupName := d.Get("resource_group_name").(string)
+	name := d.Get("name").(string)


outside of the Create function we should parse these from the ID - as such can we make this:

id, err := parseAzureResourceID(d.Id()) if err != nil { return err } name := id.Path["batchAccounts"] resourceGroupName := id.ResourceGroup

website/docs/d/batch_account.html.markdown

website/docs/r/batch_account.html.markdown

tombuildsstuff · 2018-12-10T14:49:38Z

azurerm/data_source_batch_account.go

+			},
+			"pool_allocation_mode": {
+				Type:     schema.TypeString,
+				Optional: true,


since this is the Data Source this field isn't set-able, so we can remove the Optional here

jcorioland · 2018-12-12T11:44:48Z

@tombuildsstuff - thanks for the review! I have done the updates.

katbyte

Hi @jcorioland,

Thank you for the quick updates! I've taken a look through and left some additional minor/stylistic comments. It also seems like you may have missed some of tom's in the previous review, github can be sneaky and hide them under a "14 hidden conversations / Learn More" banner.

azurerm/data_source_batch_account_test.go

azurerm/resource_arm_batch_account.go

katbyte · 2018-12-12T18:46:30Z

azurerm/resource_arm_batch_account.go

+
+	err = future.WaitForCompletionRef(ctx, client.Client)
+	// if the error is not that the Batch account was not found
+	if err != nil && future.Response().StatusCode != http.StatusNotFound {


Same

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { if !response.WasNotFound(future.Response()) { return fmt.Errorf("Error waiting for deletion of Batch account %q (Resource Group %q): %+v", name, resourceGroupName, err) } }

azurerm/resource_arm_batch_account.go

azurerm/resource_arm_batch_account_test.go

website/docs/r/batch_account.html.markdown

jcorioland · 2018-12-13T08:45:26Z

@katbyte @tombuildsstuff - thank you both for the reviews and sorry for missing a huge part of Tom's review the other day :) Should be good now!

katbyte

Thanks for the quick updates again @jcorioland, aside from some minor indentation issues this LGTM 👍

(looks like i don't have permission to push to the branch)

azurerm/data_source_batch_account_test.go

azurerm/resource_arm_batch_account_test.go

jcorioland · 2018-12-14T08:49:43Z

@katbyte - thanks for having approved this PR. I've done the few updates you've asked for. It's weird that you were not able to push on the branch, I've checked and the Allow edit from maintainers option is enabled.

tombuildsstuff

hey @jcorioland

Thanks for pushing those changes - ignoring a couple of minor comments (which I'm going to push a commit for) this now LGTM 👍 - I'll kick off the tests shortly :)

Thanks!

tombuildsstuff · 2018-12-14T09:59:14Z

azurerm/resource_arm_batch_account_test.go

+	})
+}
+
+func TestAccAzureRMBatchAccount_noStorageAccount_basic(t *testing.T) {


we should update this:

Suggested change

func TestAccAzureRMBatchAccount_noStorageAccount_basic(t *testing.T) {

func TestAccAzureRMBatchAccount_basic(t *testing.T) {

tombuildsstuff · 2018-12-14T10:00:42Z

website/docs/r/batch_account.html.markdown

+
+* `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.
+
+* `storage_account_id` - (Optional) Specifies the storage account to use for the Batch account. If not specified, Azure Batch will manage the storage.


we can remove this, since it's specified in the argument reference above

Suggested change

* `storage_account_id` - (Optional) Specifies the storage account to use for the Batch account. If not specified, Azure Batch will manage the storage.

tombuildsstuff · 2018-12-14T10:01:02Z

website/docs/r/batch_account.html.markdown

+
+* `id` - The Batch account ID.
+
+* `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.


we can remove this since it's specified in the argument reference above

Suggested change

* `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.

jcorioland · 2018-12-14T10:06:31Z

Hi @tombuildsstuff awesome, thank you!

tombuildsstuff · 2018-12-14T10:38:29Z

Resource Tests pass:

Data Source tests pass:

ghost · 2019-01-28T15:45:09Z

Hello @tombuildsstuff @jcorioland
Good work on the Batch Account support.
Judging from the PR, the tests only covered BatchService pool_allocation_mode, not UserSubscription. This failed when I specified UserSubscription. From manual inspection, there is a KeyVault requirement, but I cannot see this support in the golang, and I don't know what other code to provide to TF when I specify UserSubscription to get Batch deployed successfully in that case. Any commentary appreciated.

katbyte · 2019-01-28T18:31:31Z

Hi @phosphre,

Thanks for bringing this to our attention, but could you open a issue please? It was only by chance i happened to see this comment as we don't usually review closed PRs/

Thanks!

ghost · 2019-03-05T13:56:45Z

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!

add examples for future batch support

c9c6bf4

ghost added the size/M label Dec 3, 2018

tombuildsstuff added new-resource service/batch labels Dec 3, 2018

jcorioland added 2 commits December 3, 2018 15:28

add Azure Batch Go SDK to vendor

e691870

wip: add datasource & resource for batch account

c942f08

ghost added size/XXL and removed size/M labels Dec 3, 2018

tombuildsstuff reviewed Dec 3, 2018

View reviewed changes

jcorioland added 3 commits December 4, 2018 14:30

CRUD for Azure Batch account + tests

42a73a4

Datasource for Azure Batch account

f6dd46b

fix Batch account delete function

ec101b5

ghost added the dependencies label Dec 5, 2018

jcorioland force-pushed the feat/azurerm_batch branch from 7888ed0 to ec101b5 Compare December 6, 2018 08:03

jcorioland changed the title ~~[WIP] Support for Azure Batch~~ [WIP] Support for Azure Batch - Account Dec 6, 2018

jcorioland mentioned this pull request Dec 6, 2018

Support for Azure Batch - Pool #2461

Merged

5 tasks

jcorioland added 2 commits December 10, 2018 10:37

fix batch account create with no storage id

3f1d55c

docs for batch account

bf5a19c

ghost added the documentation label Dec 10, 2018

jcorioland changed the title ~~[WIP] Support for Azure Batch - Account~~ Support for Azure Batch - Account Dec 10, 2018

tombuildsstuff self-assigned this Dec 10, 2018

tombuildsstuff requested changes Dec 10, 2018

View reviewed changes

tombuildsstuff added the waiting-response label Dec 10, 2018

batch account fixes after review

f2a98a1

ghost removed the waiting-response label Dec 12, 2018

katbyte requested changes Dec 12, 2018

View reviewed changes

katbyte added this to the 1.21.0 milestone Dec 12, 2018

katbyte added the waiting-response label Dec 12, 2018

jcorioland added 2 commits December 13, 2018 09:40

update examples + docs for Batch account

5004ccc

update Batch account after review

8d40fb4

ghost removed the waiting-response label Dec 13, 2018

katbyte approved these changes Dec 13, 2018

View reviewed changes

azurerm/data_source_batch_account_test.go Outdated Show resolved Hide resolved

azurerm/resource_arm_batch_account_test.go Outdated Show resolved Hide resolved

azurerm/resource_arm_batch_account_test.go Outdated Show resolved Hide resolved

katbyte self-assigned this Dec 13, 2018

fix indent in test data

00d8020

tombuildsstuff approved these changes Dec 14, 2018

View reviewed changes

fixing comments from the pr

644c45a

tombuildsstuff merged commit 95ecb63 into hashicorp:master Dec 14, 2018

tombuildsstuff added a commit that referenced this pull request Dec 14, 2018

Updating to include #2428

e6de174

ghost mentioned this pull request Jan 29, 2019

azurerm_batch_account pool_allocation_mode "UserSubscription" fails #2793

Closed

hashicorp locked and limited conversation to collaborators Mar 5, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for Azure Batch - Account #2428

Support for Azure Batch - Account #2428

jcorioland commented Dec 3, 2018 •

edited

tombuildsstuff left a comment

tombuildsstuff Dec 3, 2018

jcorioland Dec 4, 2018

jcorioland Dec 4, 2018

tombuildsstuff Dec 4, 2018

tombuildsstuff commented Dec 5, 2018

jcorioland commented Dec 6, 2018 •

edited

tombuildsstuff left a comment

tombuildsstuff Dec 10, 2018

jcorioland Dec 12, 2018

tombuildsstuff Dec 10, 2018

jcorioland Dec 12, 2018

jcorioland commented Dec 12, 2018

katbyte left a comment

katbyte Dec 12, 2018

jcorioland commented Dec 13, 2018

katbyte left a comment •

edited

jcorioland commented Dec 14, 2018 •

edited

tombuildsstuff left a comment

tombuildsstuff Dec 14, 2018

tombuildsstuff Dec 14, 2018

tombuildsstuff Dec 14, 2018

jcorioland commented Dec 14, 2018

tombuildsstuff commented Dec 14, 2018

ghost commented Jan 28, 2019 •

edited by ghost

katbyte commented Jan 28, 2019

ghost commented Mar 5, 2019

	func TestAccAzureRMBatchAccount_noStorageAccount_basic(t *testing.T) {
	func TestAccAzureRMBatchAccount_basic(t *testing.T) {


		* `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.

		* `storage_account_id` - (Optional) Specifies the storage account to use for the Batch account. If not specified, Azure Batch will manage the storage.


		* `id` - The Batch account ID.

		* `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.

Support for Azure Batch - Account #2428

Support for Azure Batch - Account #2428

Conversation

jcorioland commented Dec 3, 2018 • edited

tombuildsstuff 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

tombuildsstuff commented Dec 5, 2018

jcorioland commented Dec 6, 2018 • edited

tombuildsstuff 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

jcorioland commented Dec 12, 2018

katbyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jcorioland commented Dec 13, 2018

katbyte left a comment • edited

Choose a reason for hiding this comment

jcorioland commented Dec 14, 2018 • edited

tombuildsstuff 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

jcorioland commented Dec 14, 2018

tombuildsstuff commented Dec 14, 2018

ghost commented Jan 28, 2019 • edited by ghost

katbyte commented Jan 28, 2019

ghost commented Mar 5, 2019

jcorioland commented Dec 3, 2018 •

edited

jcorioland commented Dec 6, 2018 •

edited

katbyte left a comment •

edited

jcorioland commented Dec 14, 2018 •

edited

ghost commented Jan 28, 2019 •

edited by ghost