Merge pull request #50 from Rohit-Intel-Cloud/fix_nodegroup_import

nadgowdas · web-flow · commit 8010b2acb5f5 · 2025-04-30T09:51:19.000-05:00
fix nodegroup import issue for name, sshkeys
diff --git a/examples/gen-ai-xeon-opea-chatqna/main.tf b/examples/gen-ai-xeon-opea-chatqna/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     intelcloud = {
-      source = "intel/intelcloud"
-      version = "0.0.9"
+      source  = "intel/intelcloud"
+      version = "0.0.15"
     }
   }
 }
@@ -28,14 +28,14 @@ provider "intelcloud" {
 #   }
 # }
 
- resource "intelcloud_sshkey" "example" {
-    metadata = {
-       name = var.ssh_key_name
-     }
-     spec = {
-       ssh_public_key = file(var.ssh_pubkey_path)
-     }
- }
+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-codegen/main.tf b/examples/gen-ai-xeon-opea-codegen/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     intelcloud = {
-      source = "intel/intelcloud"
-      version = "0.0.9"
+      source  = "intel/intelcloud"
+      version = "0.0.15"
     }
   }
 }
diff --git a/examples/resources/bucket_users/main.tf b/examples/resources/bucket_users/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     intelcloud = {
-      source = "intel/intelcloud"
-      version = "0.0.9"
+      source  = "intel/intelcloud"
+      version = "0.0.15"
     }
   }
 }
diff --git a/examples/resources/buckets/main.tf b/examples/resources/buckets/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     intelcloud = {
-      source = "intel/intelcloud"
-      version = "0.0.11"
+      source  = "intel/intelcloud"
+      version = "0.0.15"
     }
   }
 }
diff --git a/examples/resources/filesystems/main.tf b/examples/resources/filesystems/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intelcloud = {
       source  = "intel/intelcloud"
-      version = "0.0.11"
+      version = "0.0.15"
     }
   }
 }
diff --git a/examples/resources/iks/create/main.tf b/examples/resources/iks/create/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     intelcloud = {
       source  = "intel/intelcloud"
-      version = "0.0.11"
+      version = "0.0.15"
     }
   }
 }
diff --git a/examples/resources/iks/nodegroup/main.tf b/examples/resources/iks/nodegroup/main.tf
@@ -1,39 +1,34 @@
 terraform {
   required_providers {
     intelcloud = {
-      source = "intel/intelcloud"
-      version = "0.0.9"
+      source  = "intel/intelcloud"
+      version = "0.0.15"
     }
   }
 }
 
 
 provider "intelcloud" {
-  region = "us-region-1"
+  region = "us-region-2"
 }
 
 locals {
-  # name     = "${random_pet.prefix.id}"
-  name              = "testdemo97"
-  availability_zone = "us-region-1a"
+  name              = random_pet.prefix.id
+  availability_zone = "us-region-2a"
   tags = {
     environment = "Demo"
   }
 }
 
-resource "idc_iks_node_group" "ng1" {
-  cluster_uuid         = "cl-lc2ze6pu4i"
+resource "intelcloud_iks_node_group" "ng1" {
+  cluster_uuid         = "<your-cluster-uuid>"
   name                 = "${local.name}-ng"
   node_count           = 2
   node_type            = "vm-spr-sml"
   userdata_url         = ""
-  ssh_public_key_names = ["shrimac"]
-  interfaces = [{
-    name = "us-staging-3a"
-    vnet = "us-staging-3a-default"
-  }]
+  ssh_public_key_names = ["rk-win-key"]
 }
 
 output "iks_order" {
-  value = idc_iks_node_group.ng1
+  value = intelcloud_iks_node_group.ng1
 }
diff --git a/examples/resources/instances/main.tf b/examples/resources/instances/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intelcloud = {
       source  = "intel/intelcloud"
-      version = "0.0.11"
+      version = "0.0.15"
     }
   }
 }
diff --git a/internal/provider/iks_node_group_resource.go b/internal/provider/iks_node_group_resource.go
@@ -192,10 +192,13 @@ func (r *iksNodeGroupResource) Create(ctx context.Context, req resource.CreateRe
 	}
 
 	plan.ClusterUUID = types.StringValue(nodeGroupResp.ClusterID)
+	plan.Name = types.StringValue(nodeGroupResp.Name)
 	plan.ID = types.StringValue(nodeGroupResp.ID)
 	plan.IMIId = types.StringValue(nodeGroupResp.IMIID)
 	plan.State = types.StringValue(nodeGroupResp.State)
+	plan.Count = types.Int64Value(nodeGroupResp.Count)
 	plan.NodeType = types.StringValue(nodeGroupResp.InstanceType)
+	plan.UserDataURL = types.StringValue(nodeGroupResp.UserDataURL)
 	vnets := []models.NetworkInterfaceSpec{}
 	for _, iface := range nodeGroupResp.Interfaces {
 		v := models.NetworkInterfaceSpec{
@@ -212,6 +215,11 @@ func (r *iksNodeGroupResource) Create(ctx context.Context, req resource.CreateRe
 	}
 	plan.Vnets = vnetObj
 
+	plan.SSHPublicKeyNames = []types.String{}
+	for _, k := range nodeGroupResp.SSHKeyNames {
+		plan.SSHPublicKeyNames = append(plan.SSHPublicKeyNames, types.StringValue(k.Name))
+	}
+
 	// Set state to fully populated data
 	diags = resp.State.Set(ctx, plan)
 	resp.Diagnostics.Append(diags...)
@@ -251,11 +259,13 @@ func (r *iksNodeGroupResource) Read(ctx context.Context, req resource.ReadReques
 	}
 
 	state.ClusterUUID = types.StringValue(ngState.ClusterID)
+	state.Name = types.StringValue(ngState.Name)
 	state.ID = types.StringValue(ngState.ID)
 	state.IMIId = types.StringValue(ngState.IMIID)
 	state.State = types.StringValue(ngState.State)
 	state.Count = types.Int64Value(ngState.Count)
 	state.NodeType = types.StringValue(ngState.InstanceType)
+	state.UserDataURL = types.StringValue(ngState.UserDataURL)
 
 	vnets := []models.NetworkInterfaceSpec{}
 	for _, i := range ngState.Interfaces {
@@ -273,6 +283,11 @@ func (r *iksNodeGroupResource) Read(ctx context.Context, req resource.ReadReques
 	}
 	state.Vnets = vnetObj
 
+	state.SSHPublicKeyNames = []types.String{}
+	for _, k := range ngState.SSHKeyNames {
+		state.SSHPublicKeyNames = append(state.SSHPublicKeyNames, types.StringValue(k.Name))
+	}
+
 	// Set state to fully populated data
 	diags = resp.State.Set(ctx, &state)
 	resp.Diagnostics.Append(diags...)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`intelcloud = {`
`4`		`- source = "intel/intelcloud"`
`5`		`- version = "0.0.9"`
	`4`	`+ source = "intel/intelcloud"`
	`5`	`+ version = "0.0.15"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`intelcloud = {`
`4`	`4`	`source = "intel/intelcloud"`
`5`		`- version = "0.0.11"`
	`5`	`+ version = "0.0.15"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`intelcloud = {`
`5`	`5`	`source = "intel/intelcloud"`
`6`		`- version = "0.0.11"`
	`6`	`+ version = "0.0.15"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,39 +1,34 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`intelcloud = {`
`4`		`- source = "intel/intelcloud"`
`5`		`- version = "0.0.9"`
	`4`	`+ source = "intel/intelcloud"`
	`5`	`+ version = "0.0.15"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`	`10`
`11`	`11`	`provider "intelcloud" {`
`12`		`- region = "us-region-1"`
	`12`	`+ region = "us-region-2"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`locals {`
`16`		`- # name = "${random_pet.prefix.id}"`
`17`		`- name = "testdemo97"`
`18`		`- availability_zone = "us-region-1a"`
	`16`	`+ name = random_pet.prefix.id`
	`17`	`+ availability_zone = "us-region-2a"`
`19`	`18`	`tags = {`
`20`	`19`	`environment = "Demo"`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`
`24`		`-resource "idc_iks_node_group" "ng1" {`
`25`		`- cluster_uuid = "cl-lc2ze6pu4i"`
	`23`	`+resource "intelcloud_iks_node_group" "ng1" {`
	`24`	`+ cluster_uuid = "<your-cluster-uuid>"`
`26`	`25`	`name = "${local.name}-ng"`
`27`	`26`	`node_count = 2`
`28`	`27`	`node_type = "vm-spr-sml"`
`29`	`28`	`userdata_url = ""`
`30`		`- ssh_public_key_names = ["shrimac"]`
`31`		`- interfaces = [{`
`32`		`- name = "us-staging-3a"`
`33`		`- vnet = "us-staging-3a-default"`
`34`		`- }]`
	`29`	`+ ssh_public_key_names = ["rk-win-key"]`
`35`	`30`	`}`
`36`	`31`
`37`	`32`	`output "iks_order" {`
`38`		`- value = idc_iks_node_group.ng1`
	`33`	`+ value = intelcloud_iks_node_group.ng1`
`39`	`34`	`}`