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.

Sign up for GitHub

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

Jump to bottom

Property for hbi_enabled with machine learning workspace #7703

Merged
merged 4 commits into from
Jul 14, 2020
Merged

Property for hbi_enabled with machine learning workspace #7703

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a15ab4e
Property for hbi_enabled with ML Workspace
damienpontifex Jul 12, 2020
39e6492
hbi_workspace with integration tests
damienpontifex Jul 13, 2020
bce55be
s/hbi_workspace/high_business_impact_workspace/
damienpontifex Jul 14, 2020
fa07a2f
s/high_business_impact_workspace/high_business_impact/
damienpontifex Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azurerm/internal/services/machinelearning/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/machinelearningservices/mgmt/2019-11-01/machinelearningservices"
"github.com/Azure/azure-sdk-for-go/services/machinelearningservices/mgmt/2020-04-01/machinelearningservices"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
12 changes: 11 additions & 1 deletion azurerm/internal/services/machinelearning/machine_learning_workspace_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2018-09-01/containerregistry"
"github.com/Azure/azure-sdk-for-go/services/machinelearningservices/mgmt/2019-11-01/machinelearningservices"
"github.com/Azure/azure-sdk-for-go/services/machinelearningservices/mgmt/2020-04-01/machinelearningservices"
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down Expand Up @@ -139,6 +139,11 @@ func resourceArmMachineLearningWorkspace() *schema.Resource {
},

"tags": tags.Schema(),

"hbi_workspace": {
Type: schema.TypeBool,
Optional: true,
},
},
}
}
Expand Down Expand Up @@ -197,6 +202,10 @@ func resourceArmMachineLearningWorkspaceCreate(d *schema.ResourceData, meta inte
workspace.ContainerRegistry = utils.String(v.(string))
}

if v, ok := d.GetOk("hbi_workspace"); ok {
workspace.HbiWorkspace = utils.Bool(v.(bool))
}

accountsClient := meta.(*clients.Client).Storage.AccountsClient
if err := validateStorageAccount(ctx, accountsClient, storageAccountId); err != nil {
return fmt.Errorf("Error creating Machine Learning Workspace %q (Resource Group %q): %+v", name, resGroup, err)
Expand Down Expand Up @@ -267,6 +276,7 @@ func resourceArmMachineLearningWorkspaceRead(d *schema.ResourceData, meta interf
d.Set("container_registry_id", props.ContainerRegistry)
d.Set("description", props.Description)
d.Set("friendly_name", props.FriendlyName)
d.Set("hbi_workspace", props.HbiWorkspace)
}

if err := d.Set("identity", flattenArmMachineLearningWorkspaceIdentity(resp.Identity)); err != nil {
Expand Down
4 changes: 4 additions & 0 deletions azurerm/internal/services/machinelearning/tests/machine_learning_workspace_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func TestAccAzureRMMachineLearningWorkspace_complete(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "description", "Test machine learning workspace"),
resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "Enterprise"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "hbi_workspace", "true"),
),
},
data.ImportStep(),
Expand All @@ -121,6 +122,7 @@ func TestAccAzureRMMachineLearningWorkspace_completeUpdate(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "description", "Test machine learning workspace"),
resource.TestCheckResourceAttr(data.ResourceName, "sku_name", "Enterprise"),
resource.TestCheckResourceAttr(data.ResourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "hbi_workspace", "true"),
),
},
data.ImportStep(),
Expand Down Expand Up @@ -261,6 +263,7 @@ resource "azurerm_machine_learning_workspace" "test" {
storage_account_id = azurerm_storage_account.test.id
container_registry_id = azurerm_container_registry.test.id
sku_name = "Enterprise"
hbi_workspace = true

identity {
type = "SystemAssigned"
Expand Down Expand Up @@ -298,6 +301,7 @@ resource "azurerm_machine_learning_workspace" "test" {
storage_account_id = azurerm_storage_account.test.id
container_registry_id = azurerm_container_registry.test.id
sku_name = "Enterprise"
hbi_workspace = true

identity {
type = "SystemAssigned"
Expand Down
4 changes: 2 additions & 2 deletions ...9-11-01/machinelearningservices/client.go → ...0-04-01/machinelearningservices/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ...earningservices/machinelearningcompute.go → ...earningservices/machinelearningcompute.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading