fix: fixed wording in internal/provider/resource_kubernetes_cloud.go

Co-authored-by: Kian Parvin <[email protected]>
juju · Dec 19, 2024 · d344dfa · d344dfa
1 parent ee0178a
commit d344dfa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/docs/resources/kubernetes_cloud.md b/docs/resources/kubernetes_cloud.md
@@ -37,8 +37,8 @@ resource "juju_model" "my-model" {
 ### Optional
 
 - `kubernetes_config` (String, Sensitive) The kubernetes config file path for the cloud. Cloud credentials will be added to the Juju controller for you.
-- `parent_cloud_name` (String) The parent cloud name in case adding k8s cluster from existed cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.
-- `parent_cloud_region` (String) The parent cloud region name in case adding k8s cluster from existed cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.
+- `parent_cloud_name` (String) The parent cloud name, for adding a k8s cluster from an existing cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.
+- `parent_cloud_region` (String) The parent cloud region name, for adding a k8s cluster from an existing cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.
 
 ### Read-Only
 

diff --git a/internal/provider/resource_kubernetes_cloud.go b/internal/provider/resource_kubernetes_cloud.go
@@ -100,11 +100,11 @@ func (r *kubernetesCloudResource) Schema(_ context.Context, req resource.SchemaR
 				Sensitive:   true,
 			},
 			"parent_cloud_name": schema.StringAttribute{
-				Description: "The parent cloud name in case adding k8s cluster from existed cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.",
+				Description: "The parent cloud name, for adding a k8s cluster from an existing cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.",
 				Optional:    true,
 			},
 			"parent_cloud_region": schema.StringAttribute{
-				Description: "The parent cloud region name in case adding k8s cluster from existed cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.",
+				Description: "The parent cloud region name, for adding a k8s cluster from an existing cloud. Changing this value will cause the cloud to be destroyed and recreated by terraform. *Note* that this value must be set when running against a JAAS controller.",
 				Optional:    true,
 			},
 			"id": schema.StringAttribute{
@@ -273,7 +273,7 @@ func (v *kuberenetesCloudJAASValidator) Description(ctx context.Context) string
 
 // MarkdownDescription implements the MarkdownDescription method of the resource.ConfigValidator interface.
 func (v *kuberenetesCloudJAASValidator) MarkdownDescription(_ context.Context) string {
-	return "Enforces that this resource can only be used with JAAS"
+	return "Enforces that the parent_cloud_name is specified when applying to a JAAS controller."
 }
 
 // ValidateResource implements the ValidateResource method of the resource.ConfigValidator interface.
@@ -293,11 +293,7 @@ func (v *kuberenetesCloudJAASValidator) ValidateResource(ctx context.Context, re
 	}
 
 	if data.ParentCloudName.ValueString() == "" {
-		resp.Diagnostics.AddError("Plan Error", "parent_cloud_name must be specified when applying to a JAAS controller")
-	}
-
-	if data.ParentCloudRegion.ValueString() == "" {
-		resp.Diagnostics.AddError("Plan Error", "parent_cloud_region must be specified when applying to a JAAS controller")
+		resp.Diagnostics.AddError("Plan Error", "Field `parent_cloud_name` must be specified when applying to a JAAS controller.")
 	}
 }
 

diff --git a/internal/provider/resource_kubernetes_cloud_test.go b/internal/provider/resource_kubernetes_cloud_test.go
@@ -59,12 +59,10 @@ func TestAcc_ResourceKubernetesCloudWithJAASIncompleteConfig(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: frameworkProviderFactories,
-		Steps: []resource.TestStep{
-			{
-				Config:      testAccResourceKubernetesCloudWithoutParentCloud(cloudName, cloudConfig),
-				ExpectError: regexp.MustCompile("parent_cloud_region must be specified when applying to a JAAS controller"),
-			},
-		},
+		Steps: []resource.TestStep{{
+			Config:      testAccResourceKubernetesCloudWithoutParentCloudName(cloudName, cloudConfig),
+			ExpectError: regexp.MustCompile("Field `parent_cloud_name` must be specified when applying to a JAAS.*"),
+		}},
 	})
 }
 
@@ -87,7 +85,7 @@ resource "juju_kubernetes_cloud" "{{.CloudName}}" {
 		})
 }
 
-func testAccResourceKubernetesCloudWithoutParentCloud(cloudName string, config string) string {
+func testAccResourceKubernetesCloudWithoutParentCloudName(cloudName string, config string) string {
 	return internaltesting.GetStringFromTemplateWithData(
 		"testAccResourceSecret",
 		`