From f2d95e40c03054843b871ed48139b375796d77b7 Mon Sep 17 00:00:00 2001
From: arcturusZhang <ufo54153@gmail.com>
Date: Tue, 24 Dec 2019 11:10:13 +0800
Subject: [PATCH] Rebased to master

---
 azurerm/internal/provider/services.go                     | 2 ++
 .../data_source_machine_learning_workspace.go             | 2 +-
 .../data_source_machine_learning_workspace_test.go        | 2 +-
 azurerm/internal/services/machinelearning/registration.go | 8 ++++++--
 .../resource_arm_machine_learning_workspace.go            | 2 +-
 .../resource_arm_machine_learning_workspace_test.go       | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)
 rename azurerm/{ => internal/services/machinelearning}/data_source_machine_learning_workspace.go (99%)
 rename azurerm/{ => internal/services/machinelearning}/data_source_machine_learning_workspace_test.go (97%)
 rename azurerm/{ => internal/services/machinelearning}/resource_arm_machine_learning_workspace.go (99%)
 rename azurerm/{ => internal/services/machinelearning}/resource_arm_machine_learning_workspace_test.go (99%)

diff --git a/azurerm/internal/provider/services.go b/azurerm/internal/provider/services.go
index 70d8913b5c2f..602bc473bcde 100644
--- a/azurerm/internal/provider/services.go
+++ b/azurerm/internal/provider/services.go
@@ -32,6 +32,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/kusto"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loganalytics"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/logic"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/machinelearning"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/managementgroup"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maps"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb"
@@ -96,6 +97,7 @@ func SupportedServices() []common.ServiceRegistration {
 		kusto.Registration{},
 		loganalytics.Registration{},
 		logic.Registration{},
+		machinelearning.Registration{},
 		managementgroup.Registration{},
 		maps.Registration{},
 		mariadb.Registration{},
diff --git a/azurerm/data_source_machine_learning_workspace.go b/azurerm/internal/services/machinelearning/data_source_machine_learning_workspace.go
similarity index 99%
rename from azurerm/data_source_machine_learning_workspace.go
rename to azurerm/internal/services/machinelearning/data_source_machine_learning_workspace.go
index b893755f4d48..e3552cb54ae1 100644
--- a/azurerm/data_source_machine_learning_workspace.go
+++ b/azurerm/internal/services/machinelearning/data_source_machine_learning_workspace.go
@@ -1,4 +1,4 @@
-package azurerm
+package machinelearning
 
 import (
 	"fmt"
diff --git a/azurerm/data_source_machine_learning_workspace_test.go b/azurerm/internal/services/machinelearning/data_source_machine_learning_workspace_test.go
similarity index 97%
rename from azurerm/data_source_machine_learning_workspace_test.go
rename to azurerm/internal/services/machinelearning/data_source_machine_learning_workspace_test.go
index 3b493615ea94..08ab4a654083 100644
--- a/azurerm/data_source_machine_learning_workspace_test.go
+++ b/azurerm/internal/services/machinelearning/data_source_machine_learning_workspace_test.go
@@ -1,4 +1,4 @@
-package azurerm
+package machinelearning
 
 import (
 	"fmt"
diff --git a/azurerm/internal/services/machinelearning/registration.go b/azurerm/internal/services/machinelearning/registration.go
index 292cc925b4d6..a6ff0ee6d444 100644
--- a/azurerm/internal/services/machinelearning/registration.go
+++ b/azurerm/internal/services/machinelearning/registration.go
@@ -11,10 +11,14 @@ func (r Registration) Name() string {
 
 // SupportedDataSources returns the supported Data Sources supported by this Service
 func (r Registration) SupportedDataSources() map[string]*schema.Resource {
-	return map[string]*schema.Resource{}
+	return map[string]*schema.Resource{
+		"azurerm_machine_learning_workspace": dataSourceArmAMLWorkspace(),
+	}
 }
 
 // SupportedResources returns the supported Resources supported by this Service
 func (r Registration) SupportedResources() map[string]*schema.Resource {
-	return map[string]*schema.Resource{}
+	return map[string]*schema.Resource{
+		"azurerm_machine_learning_workspace": resourceArmAmlWorkspace(),
+	}
 }
diff --git a/azurerm/resource_arm_machine_learning_workspace.go b/azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace.go
similarity index 99%
rename from azurerm/resource_arm_machine_learning_workspace.go
rename to azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace.go
index f13ac14c489b..306f7cc06876 100644
--- a/azurerm/resource_arm_machine_learning_workspace.go
+++ b/azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace.go
@@ -1,4 +1,4 @@
-package azurerm
+package machinelearning
 
 import (
 	"fmt"
diff --git a/azurerm/resource_arm_machine_learning_workspace_test.go b/azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace_test.go
similarity index 99%
rename from azurerm/resource_arm_machine_learning_workspace_test.go
rename to azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace_test.go
index 0d43fdd5a3ec..1f8c0771ab95 100644
--- a/azurerm/resource_arm_machine_learning_workspace_test.go
+++ b/azurerm/internal/services/machinelearning/resource_arm_machine_learning_workspace_test.go
@@ -1,4 +1,4 @@
-package azurerm
+package machinelearning
 
 import (
 	"fmt"