Merge branch 'main' into CCM-12214

harness · Apr 28, 2023 · 524467c · 524467c
2 parents 77c99da + f289e83
commit 524467c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/.changelog/520.txt b/.changelog/520.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+platform_connector_terraform_cloud - Improved Documentation
+```
diff --git a/docs/data-sources/platform_connector_terraform_cloud.md b/docs/data-sources/platform_connector_terraform_cloud.md
@@ -21,9 +21,12 @@ data "harness_platform_connector_terraform_cloud" "example" {
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Optional
+### Required
 
 - `identifier` (String) Unique identifier of the resource.
+
+### Optional
+
 - `name` (String) Name of the resource.
 - `org_id` (String) Unique identifier of the organization.
 - `project_id` (String) Unique identifier of the project.

diff --git a/docs/resources/platform_connector_terraform_cloud.md b/docs/resources/platform_connector_terraform_cloud.md
@@ -21,6 +21,7 @@ resource "harness_platform_connector_terraform_cloud" "terraform_cloud" {
   description        = "description of terraform cloud connector"
   tags               = ["foo:bar"]
   delegate_selectors = ["harness-delegate"]
+  url                = "https://app.terraform.io/"
   credentials {
     api_token {
       api_token_ref = "account.TEST_terraform_cloud_api_token"
@@ -37,6 +38,7 @@ resource "harness_platform_connector_terraform_cloud" "terraform_cloud" {
   delegate_selectors  = ["harness-delegate"]
   tags                = ["foo:bar"]
   execute_on_delegate = false
+  url                 = "https://app.terraform.io/"
   credentials {
     api_token {
       api_token_ref = "account.TEST_terraform_cloud_api_token"
@@ -86,6 +88,12 @@ Required:
 Import is supported using the following syntax:
 
 ```shell
-# Import using the Terraform Cloud provider connector ID.
+# Import account level Terraform Cloud provider connector 
 terraform import harness_platform_connector_terraform_cloud.example <connector_id>
+
+# Import org level Terraform Cloud provider connector 
+terraform import harness_platform_connector_terraform_cloud.example <ord_id>/<connector_id>
+
+# Import project level Terraform Cloud provider connector 
+terraform import harness_platform_connector_terraform_cloud.example <org_id>/<project_id>/<connector_id>
 ```
diff --git a/examples/resources/harness_platform_connector_terraform_cloud/import.sh b/examples/resources/harness_platform_connector_terraform_cloud/import.sh
@@ -1,2 +1,8 @@
-# Import using the Terraform Cloud provider connector ID.
+# Import account level Terraform Cloud provider connector 
 terraform import harness_platform_connector_terraform_cloud.example <connector_id>
+
+# Import org level Terraform Cloud provider connector 
+terraform import harness_platform_connector_terraform_cloud.example <ord_id>/<connector_id>
+
+# Import project level Terraform Cloud provider connector 
+terraform import harness_platform_connector_terraform_cloud.example <org_id>/<project_id>/<connector_id>
diff --git a/examples/resources/harness_platform_connector_terraform_cloud/resource.tf b/examples/resources/harness_platform_connector_terraform_cloud/resource.tf
@@ -6,6 +6,7 @@ resource "harness_platform_connector_terraform_cloud" "terraform_cloud" {
   description        = "description of terraform cloud connector"
   tags               = ["foo:bar"]
   delegate_selectors = ["harness-delegate"]
+  url                = "https://app.terraform.io/"
   credentials {
     api_token {
       api_token_ref = "account.TEST_terraform_cloud_api_token"
@@ -22,6 +23,7 @@ resource "harness_platform_connector_terraform_cloud" "terraform_cloud" {
   delegate_selectors  = ["harness-delegate"]
   tags                = ["foo:bar"]
   execute_on_delegate = false
+  url                 = "https://app.terraform.io/"
   credentials {
     api_token {
       api_token_ref = "account.TEST_terraform_cloud_api_token"

diff --git a/internal/service/platform/connector/terraform_cloud_data_source.go b/internal/service/platform/connector/terraform_cloud_data_source.go
@@ -48,7 +48,7 @@ func DatasourceConnectorTerraformCloud() *schema.Resource {
 		},
 	}
 
-	helpers.SetMultiLevelDatasourceSchema(resource.Schema)
+	helpers.SetMultiLevelDatasourceSchemaIdentifierRequired(resource.Schema)
 
 	return resource
 }