chore: change owner_name to be email if the type is user (#147)

* chore: change owner_name to be email if the type is user * fix indentation
nirmata · May 2, 2023 · d5cb956 · d5cb956
1 parent 4c577e9
commit d5cb956
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 14 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -72,9 +72,9 @@ resource "nirmata_cluster" "eks-eu" {
 
 ### owner_info
 * `owner_type` - (Required) The type of the owner. Valid values are user or team.
-* `owner_name` - (Required) The name of the user/team.
+* `owner_name` - (Required) The email of the user or the name of the team.
 
 ### access_control_list
 * `entity_type` - (Required) The type of entity. Valid values are user or team.
 * `permission` - (Required) The permission. Valid values are admin, edit, view.
-* `name` - (Required) The name of the user/team.
+* `name` - (Required) The email of the user or the name of the team.
diff --git a/docs/resources/cluster_eks_imported.md b/docs/resources/cluster_eks_imported.md
@@ -44,9 +44,9 @@ resource "nirmata_cluster_imported" "eks-import" {
 
 ### owner_info
 * `owner_type` - (Required) The type of the owner. Valid values are user or team.
-* `owner_name` - (Required) The name of the user/team.
+* `owner_name` - (Required) The email of the user or the name of the team.
 
 ### access_control_list
 * `entity_type` - (Required) The type of entity. Valid values are user or team.
 * `permission` - (Required) The permission. Valid values are admin, edit, view.
-* `name` - (Required) The name of the user/team.
+* `name` - (Required) The email of the user or the name of the team.
diff --git a/docs/resources/cluster_eks_registered.md b/docs/resources/cluster_eks_registered.md
@@ -75,9 +75,9 @@ resource "kubectl_manifest" "test" {
 
 ### owner_info
 * `owner_type` - (Required) The type of the owner. Valid values are user or team.
-* `owner_name` - (Required) The name of the user/team.
+* `owner_name` - (Required) The email of the user or the name of the team.
 
 ### access_control_list
 * `entity_type` - (Required) The type of entity. Valid values are user or team.
 * `permission` - (Required) The permission. Valid values are admin, edit, view.
-* `name` - (Required) The name of the user/team.
+* `name` - (Required) The email of the user or the name of the team.
diff --git a/docs/resources/cluster_gke_imported.md b/docs/resources/cluster_gke_imported.md
@@ -62,12 +62,12 @@ resource "nirmata_cluster_imported" "gke-import-1" {
 
 ### owner_info
 * `owner_type` - (Required) The type of the owner. Valid values are user or team.
-* `owner_name` - (Required) The name of the user/team.
+* `owner_name` - (Required) The email of the user or the name of the team.
 
 ### access_control_list
 * `entity_type` - (Required) The type of entity. Valid values are user or team.
 * `permission` - (Required) The permission. Valid values are admin, edit, view.
-* `name` - (Required) The name of the user/team.
+* `name` - (Required) The email of the user or the name of the team.
 
 ### vault_auth
 

diff --git a/docs/resources/cluster_kind_registered.md b/docs/resources/cluster_kind_registered.md
@@ -89,12 +89,12 @@ cluster_ca_certificate = "LS0tLS1CRUdJTiB..."
 
 ### owner_info
 * `owner_type` - (Required) The type of the owner. Valid values are user or team.
-* `owner_name` - (Required) The name of the user/team.
+* `owner_name` - (Required) The email of the user or the name of the team.
 
 ### access_control_list
 * `entity_type` - (Required) The type of entity. Valid values are user or team.
 * `permission` - (Required) The permission. Valid values are admin, edit, view.
-* `name` - (Required) The name of the user/team.
+* `name` - (Required) The email of the user or the name of the team.
 
 
 
diff --git a/examples/register/aks/aks.tf b/examples/register/aks/aks.tf
@@ -13,6 +13,25 @@ resource "nirmata_cluster_registered" "aks-registered" {
   name         = "aks-cluster"
   cluster_type = "default-add-ons"
   endpoint     = "https://endpoint"
+  owner_info {
+    owner_type = "team"
+    owner_name = "team1"
+  }
+  access_control_list {
+    entity_type = "user"
+    permission  = "admin"
+    name        = "user1@myorg.com"
+  }
+  access_control_list {
+    entity_type = "team"
+    permission  = "view"
+    name        = "team2"
+  }
+  access_control_list {
+    entity_type = "user"
+    permission  = "edit"
+    name        = "user2@myorg.com"
+  }
 }
 
 # Retrieve AKS cluster information
@@ -21,8 +40,8 @@ provider "azurerm" {
 }
 
 data "azurerm_kubernetes_cluster" "cluster" {
-  name                = "tf-test"
-  resource_group_name = "tf-test-group"
+  name                = "test-01"
+  resource_group_name = "test-0_group"
 }
 
 provider "kubectl" {

diff --git a/pkg/nirmata/api_utils.go b/pkg/nirmata/api_utils.go
@@ -267,7 +267,7 @@ func getPolicyDeployGroupStatus(api client.Client, ID client.ID) (string, error)
 
 func getUsers(api client.Client) ([]map[string]interface{}, error) {
 	opts := &client.GetOptions{}
-	opts.Fields = []string{"id", "name", "modelIndex", "service"}
+	opts.Fields = []string{"id", "name", "email", "modelIndex", "service"}
 	objs, err := api.GetCollection(client.ServiceUsers, "User", opts)
 	if err != nil {
 		log.Printf("[ERROR] Failed to fetch users: %v", err)

diff --git a/pkg/nirmata/resource_cluster_registered.go b/pkg/nirmata/resource_cluster_registered.go
@@ -124,7 +124,13 @@ func fetchOwnerId(owner_type, owner_name string, users, teams []map[string]inter
 		data = teams
 	}
 	for _, d := range data {
-		if owner_name == d["name"] {
+		var name string
+		if owner_type == "user" {
+			name = d["email"].(string)
+		} else {
+			name = d["name"].(string)
+		}
+		if owner_name == name {
 			id := d["id"].(string)
 			log.Printf("[DEBUG] - Found match for owner_name %s with id %s", owner_name, id)
 			return id, nil