fix: kubernetes cloud resource

juju · Dec 16, 2024 · f121fc0 · f121fc0
1 parent 54f8588
commit f121fc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/provider/resource_kubernetes_cloud.go b/internal/provider/resource_kubernetes_cloud.go
@@ -128,8 +128,10 @@ func (r *kubernetesCloudResource) Create(ctx context.Context, req resource.Creat
 	// Create the kubernetes cloud.
 	cloudCredentialName, err := r.client.Clouds.CreateKubernetesCloud(
 		&juju.CreateKubernetesCloudInput{
-			Name:             plan.CloudName.ValueString(),
-			KubernetesConfig: plan.KubernetesConfig.ValueString(),
+			Name:              plan.CloudName.ValueString(),
+			KubernetesConfig:  plan.KubernetesConfig.ValueString(),
+			ParentCloudName:   plan.ParentCloudName.String(),
+			ParentCloudRegion: plan.ParentCloudRegion.String(),
 		},
 	)
 	if err != nil {
@@ -201,8 +203,10 @@ func (r *kubernetesCloudResource) Update(ctx context.Context, req resource.Updat
 	// Update the kubernetes cloud.
 	err := r.client.Clouds.UpdateKubernetesCloud(
 		juju.UpdateKubernetesCloudInput{
-			Name:             plan.CloudName.ValueString(),
-			KubernetesConfig: plan.KubernetesConfig.ValueString(),
+			Name:              plan.CloudName.ValueString(),
+			KubernetesConfig:  plan.KubernetesConfig.ValueString(),
+			ParentCloudName:   plan.ParentCloudName.String(),
+			ParentCloudRegion: plan.ParentCloudRegion.String(),
 		},
 	)
 	if err != nil {

diff --git a/internal/provider/resource_kubernetes_cloud_test.go b/internal/provider/resource_kubernetes_cloud_test.go
@@ -14,12 +14,6 @@ import (
 )
 
 func TestAcc_ResourceKubernetesCloud(t *testing.T) {
-	// Note (alesstimec): Skipping this test, because the default
-	// hosted cloud tf provider adds is "other", which cannot
-	// be parsed by JIMM - it needs a valid cloud/region to determine
-	// which controller to add the cloud to.
-	SkipJAAS(t)
-
 	// TODO: This test is not adding model as a resource, which is required.
 	// The reason in the race that we (potentially) have in the Juju side.
 	// Once the problem is fixed (https://bugs.launchpad.net/juju/+bug/2084448),
@@ -51,6 +45,8 @@ func testAccResourceKubernetesCloudWithoutModel(cloudName string, config string)
 resource "juju_kubernetes_cloud" "{{.CloudName}}" {
  name = "{{.CloudName}}"
  kubernetes_config = file("~/microk8s-config.yaml")
+ parent_cloud_name = "localhost"
+ parent_cloud_region = "localhost"
 }
 `, internaltesting.TemplateData{
 			"CloudName": cloudName,