Merge pull request #34 from Rohit-Intel-Cloud/owner_email_computed

nadgowdas · web-flow · commit deb35f995c26 · 2025-03-23T08:53:02.000-05:00
make owner email as computed field, update examples
diff --git a/examples/gen-ai-xeon-opea-chatqna/README.md b/examples/gen-ai-xeon-opea-chatqna/README.md
@@ -18,7 +18,6 @@ idc_region            = "us-region-2"
 ssh_key_name          = "<SSH_KEY>"
 instance_name         = "genai-chatqna-demo3"
 ssh_pubkey_path       = "<PATH_TO_SSH_PUBKEY>"
-ssh_user_email        = "<USER_EMAIL>"
 instance_type         = "vm-large"
 filesystem_name       = "shri-fs6"
 filesystem_size_in_tb = 1
diff --git a/examples/gen-ai-xeon-opea-chatqna/main.tf b/examples/gen-ai-xeon-opea-chatqna/main.tf
@@ -28,15 +28,14 @@ provider "intelcloud" {
 #   }
 # }
 
-# resource "intelcloud_sshkey" "example" {
-#    metadata = {
-#       name = var.ssh_key_name
-#     }
-#     spec = {
-#       ssh_public_key = file(var.ssh_pubkey_path)
-#       owner_email = var.ssh_user_email
-#     }
-# }
+ resource "intelcloud_sshkey" "example" {
+    metadata = {
+       name = var.ssh_key_name
+     }
+     spec = {
+       ssh_public_key = file(var.ssh_pubkey_path)
+     }
+ }
 
 resource "intelcloud_instance" "example" {
   name = var.instance_name
diff --git a/examples/gen-ai-xeon-opea-chatqna/terraform.tfvars b/examples/gen-ai-xeon-opea-chatqna/terraform.tfvars
@@ -1,9 +1,7 @@
 idc_region            = "us-staging-1"
 ssh_key_name          = "shrimac"
 instance_name         = "genai-chatqna-demo3"
-ssh_pubkey_path       = <path-to-your-public-key-file>
-ssh_privatekey_path   = <path-to-your-private-key-file>
-ssh_user_email        = "shripad.nadgowda@intel.com"
+ssh_pubkey_path       = "/Users/snadgowd/.ssh/id_ed25519.pub"
 instance_type         = "vm-large"
 filesystem_name       = "shri-fs6"
 filesystem_size_in_tb = 1
diff --git a/examples/gen-ai-xeon-opea-chatqna/variables.tf b/examples/gen-ai-xeon-opea-chatqna/variables.tf
@@ -10,10 +10,6 @@ variable "ssh_privatekey_path" {
   type = string
 }
 
-variable "ssh_user_email" {
-  type = string
-}
-
 variable "instance_name" {
   type = string
 }
diff --git a/examples/gen-ai-xeon-opea-codegen/README.md b/examples/gen-ai-xeon-opea-codegen/README.md
@@ -12,13 +12,12 @@ Change the `cloud_init.yaml` file to add your hugging face token (you can create
 ```shell
   - echo 'export HUGGINGFACEHUB_API_TOKEN=<HUGGINGFACE_API_TOKEN>' | sudo tee -a /etc/profile.d/opea.sh
 ```
-Change the `terraform.tfvars` file to add your `ssh_keyname` , `ssh_pubkey_path` and `ssh_user_email`
+Change the `terraform.tfvars` file to add your `ssh_keyname` , `ssh_pubkey_path` 
 ```shell
 idc_region            = "us-region-2"
 ssh_key_name          = "<SSH_KEY>"
 instance_name         = "genai-chatqna-demo3"
 ssh_pubkey_path       = "<PATH_TO_SSH_PUBKEY>"
-ssh_user_email        = "<USER_EMAIL>"
 instance_type         = "vm-large"
 filesystem_name       = "shri-fs6"
 filesystem_size_in_tb = 1
diff --git a/examples/gen-ai-xeon-opea-codegen/main.tf b/examples/gen-ai-xeon-opea-codegen/main.tf
@@ -34,7 +34,6 @@ provider "intelcloud" {
 #     }
 #     spec = {
 #       ssh_public_key = file(var.ssh_pubkey_path)
-#       owner_email = var.ssh_user_email
 #     }
 # }
 
diff --git a/examples/gen-ai-xeon-opea-codegen/terraform.tfvars b/examples/gen-ai-xeon-opea-codegen/terraform.tfvars
@@ -3,7 +3,6 @@ ssh_key_name          = "shrimac"
 instance_name         = "genai-codegen-demo3"
 ssh_pubkey_path       = <path-to-your-public-key-file>
 ssh_privatekey_path   = <path-to-your-private-key-file>
-ssh_user_email        = "<email>"
 instance_type         = "vm-large"
 filesystem_name       = "shri-fs6"
 filesystem_size_in_tb = 1
diff --git a/examples/gen-ai-xeon-opea-codegen/variables.tf b/examples/gen-ai-xeon-opea-codegen/variables.tf
@@ -10,10 +10,6 @@ variable "ssh_privatekey_path" {
   type = string
 }
 
-variable "ssh_user_email" {
-  type = string
-}
-
 variable "instance_name" {
   type = string
 }
diff --git a/examples/resources/all_resources/main.tf b/examples/resources/all_resources/main.tf
@@ -35,7 +35,6 @@ resource "idc_sshkey" "sshkey-1" {
   }
   spec = {
     ssh_public_key = file(var.ssh_pubkey_path)
-    owner_email    = var.ssh_user_email
   }
 }
 
diff --git a/examples/resources/all_resources/terraform.tfvars b/examples/resources/all_resources/terraform.tfvars
@@ -1,5 +1,4 @@
 idc_region            = "us-region-2"
 ssh_pubkey_path       = "/Users/snadgowd/.ssh/id_ed25519.pub"
-ssh_user_email        = "shripad.nadgowda@intel.com"
 instance_type         = "vm-small"
 filesystem_size_in_gb = 90
diff --git a/examples/resources/all_resources/variables.tf b/examples/resources/all_resources/variables.tf
@@ -2,10 +2,6 @@ variable "ssh_pubkey_path" {
   type = string
 }
 
-variable "ssh_user_email" {
-  type = string
-}
-
 variable "filesystem_description" {
   type    = string
   default = "demo filesystem"
diff --git a/internal/provider/sshkey_resource.go b/internal/provider/sshkey_resource.go
@@ -88,7 +88,8 @@ func (r *sshKeyResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 						Required: true,
 					},
 					"owner_email": schema.StringAttribute{
-						Required: true,
+						Computed: true,
+						Optional: true,
 					},
 				},
 			},
@@ -115,10 +116,8 @@ func (r *sshKeyResource) Create(ctx context.Context, req resource.CreateRequest,
 		},
 		Spec: struct {
 			SSHPublicKey string "json:\"sshPublicKey\""
-			OwnerEmail   string "json:\"ownerEmail\""
 		}{
 			SSHPublicKey: plan.Spec.SSHPublicKey.ValueString(),
-			OwnerEmail:   plan.Spec.OwnerEmail.ValueString(),
 		},
 	}
 	tflog.Info(ctx, "making a call to IDC Service for create sshkey")
@@ -135,6 +134,7 @@ func (r *sshKeyResource) Create(ctx context.Context, req resource.CreateRequest,
 	plan.Metadata.CreatedAt = types.StringValue(time.Now().Format(time.RFC850))
 	plan.Metadata.ResourceId = types.StringValue(sshkeyCreateResp.Metadata.ResourceId)
 	plan.Metadata.Cloudaccount = types.StringValue(sshkeyCreateResp.Metadata.Cloudaccount)
+	plan.Spec.OwnerEmail = types.StringValue(sshkeyCreateResp.Spec.OwnerEmail)
 
 	// Set state to fully populated data
 	diags = resp.State.Set(ctx, plan)
diff --git a/pkg/itacservices/sshkeys.go b/pkg/itacservices/sshkeys.go
@@ -41,7 +41,6 @@ type SSHKeyCreateRequest struct {
 	} `json:"metadata"`
 	Spec struct {
 		SSHPublicKey string `json:"sshPublicKey"`
-		OwnerEmail   string `json:"ownerEmail"`
 	} `json:"spec"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ variable "ssh_privatekey_path" {`
`10`	`10`	`type = string`
`11`	`11`	`}`
`12`	`12`
`13`		`-variable "ssh_user_email" {`
`14`		`- type = string`
`15`		`-}`
`16`		`-`
`17`	`13`	`variable "instance_name" {`
`18`	`14`	`type = string`
`19`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ resource "idc_sshkey" "sshkey-1" {`
`35`	`35`	`}`
`36`	`36`	`spec = {`
`37`	`37`	`ssh_public_key = file(var.ssh_pubkey_path)`
`38`		`- owner_email = var.ssh_user_email`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`