Fix test and lint issues

ishangupta-ds · ishangupta-ds · commit e8df6645d8d0 · 2024-03-20T11:00:06.000+05:30
Signed-off-by: Ishan Gupta &lt;gishan@vmware.com&gt;
diff --git a/examples/data-sources/inspections/datasource_inspections.tf b/examples/data-sources/inspections/datasource_inspections.tf
@@ -1,9 +1,9 @@
- data "tanzu-mission-control_inspections" "demo" {
-   management_cluster_name = "MGMT_CLS_NAME"
-   provisioner_name        = "PROVISIONER_NAME"
-   cluster_name            = "CLS_NAME"
- }
+data "tanzu-mission-control_inspections" "demo" {
+  management_cluster_name = "MGMT_CLS_NAME"
+  provisioner_name        = "PROVISIONER_NAME"
+  cluster_name            = "CLS_NAME"
+}
 
- output "inspections" {
-   value = data.tanzu-mission-control_inspections.demo.inspections
- }
+output "inspections" {
+  value = data.tanzu-mission-control_inspections.demo.inspections
+}
diff --git a/examples/data-sources/management_cluster/data-source.tf b/examples/data-sources/management_cluster/data-source.tf
@@ -1,5 +1,5 @@
 # Read Tanzu Mission Control management cluster registration : fetch management cluster registration details
 data "tanzu-mission-control_management_cluster" "read_management_cluster_registration" {
-  name   = "default" # Required
+  name   = "default"              # Required
   org_id = "<ID of Organization>" # Optional value
 }
diff --git a/examples/data-sources/provisioner/data_source_provisioner.tf b/examples/data-sources/provisioner/data_source_provisioner.tf
@@ -1,8 +1,8 @@
 # Read Tanzu Mission Control provisioner : fetch the given provisioner details
 data "tanzu-mission-control_provisioner" "read_provisioner" {
   provisioners {
-    name = "test-provisioner" # Optional
-    management_cluster = "eks" # Required
+    name               = "test-provisioner" # Optional
+    management_cluster = "eks"              # Required
   }
 }
 
diff --git a/examples/resources/dataprotection/resource_enable_data_protection_cluster_group.tf b/examples/resources/dataprotection/resource_enable_data_protection_cluster_group.tf
@@ -1,7 +1,7 @@
 resource "tanzu-mission-control_enable_data_protection" "cgdemo" {
   scope {
     cluster_group {
-      cluster_group_name            = "default"
+      cluster_group_name = "default"
     }
   }
 
@@ -11,21 +11,21 @@ resource "tanzu-mission-control_enable_data_protection" "cgdemo" {
     enable_all_api_group_versions_backup = false
 
     selector {
-        labelselector {
-            matchexpressions {
-                key      = "site"
-                operator = "NotIn"
-                values   = [
-                    "one",
-                    "two"
-                ]
-            }
+      labelselector {
+        matchexpressions {
+          key      = "site"
+          operator = "NotIn"
+          values = [
+            "one",
+            "two"
+          ]
         }
+      }
     }
   }
 
   deletion_policy {
     delete_backups = false
-    force = true
+    force          = true
   }
 }
diff --git a/examples/resources/ekscluster/cluster.tf b/examples/resources/ekscluster/cluster.tf
@@ -54,7 +54,7 @@ resource "tanzu-mission-control_ekscluster" "tf_eks_cluster" {
         vpc_cni_config {
           eni_config {
             id = "subnet-0a680171b6330619f" // Required, need not belong to the same VPC as the cluster, subnets provided in vpc_cni_config are expected to be in different AZs
-            security_groups = [ //optional, if not provided, the cluster security group will be used
+            security_groups = [             //optional, if not provided, the cluster security group will be used
               "sg-00c96ad9d02a22522",
             ]
           }
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgm.tf b/examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgm.tf
@@ -2,7 +2,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group            = "default" // Required
+    cluster_group            = "default"                      // Required
     kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
   }
 }
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgs.tf b/examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgs.tf
@@ -2,7 +2,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group    = "default" // Required
+    cluster_group            = "default"                              // Required
     kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
   }
 }
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_tkgm.tf b/examples/resources/management_cluster/resource_management_cluster_registration_tkgm.tf
@@ -2,11 +2,11 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group                            = "default" // Required
-    kubernetes_provider_type                 = "VMWARE_TANZU_KUBERNETES_GRID" // Required
-    image_registry                           = "image_registry_value" // Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
-    managed_workload_cluster_image_registry  = "workload_cluster_image_registry_value" // Optional - only allowed with TKGm - only allowed if image_registry is not empty
-    management_proxy_name                    = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
-    managed_workload_cluster_proxy_name      = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
+    cluster_group                           = "default"                               // Required
+    kubernetes_provider_type                = "VMWARE_TANZU_KUBERNETES_GRID"          // Required
+    image_registry                          = "image_registry_value"                  // Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
+    managed_workload_cluster_image_registry = "workload_cluster_image_registry_value" // Optional - only allowed with TKGm - only allowed if image_registry is not empty
+    management_proxy_name                   = "proxy_name_value"                      // Optional - name of proxy configuration to use which is already configured in TMC
+    managed_workload_cluster_proxy_name     = "workload_cluster_proxy_name_value"     // Optional - only allowed if proxy_name is not empty
   }
 }
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_tkgs.tf b/examples/resources/management_cluster/resource_management_cluster_registration_tkgs.tf
@@ -2,9 +2,9 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group                       = "default" // Required
+    cluster_group                       = "default"                              // Required
     kubernetes_provider_type            = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
-    management_proxy_name               = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
-    managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
+    management_proxy_name               = "proxy_name_value"                     // Optional - name of proxy configuration to use which is already configured in TMC
+    managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value"    // Optional - only allowed if proxy_name is not empty
   }
 }
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_file_path.tf b/examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_file_path.tf
@@ -2,13 +2,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group            = "default" // Required
+    cluster_group            = "default"                      // Required
     kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
   }
 
   register_management_cluster {
-    tkgm_kubeconfig_file      = "<kube-config-path>" // Required
-    tkgm_description          = "optional description about the kube-config provided" // Optional
+    tkgm_kubeconfig_file = "<kube-config-path>"                                  // Required
+    tkgm_description     = "optional description about the kube-config provided" // Optional
   }
 
   ready_wait_timeout = "15m" // Optional , default value is 15m
diff --git a/examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_raw_input.tf b/examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_raw_input.tf
@@ -2,12 +2,12 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
   name = "tf-registration-test" // Required
 
   spec {
-    cluster_group    = "default" // Required
+    cluster_group            = "default"                      // Required
     kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
   }
 
   register_management_cluster {
-    tkgm_kubeconfig_raw = var.kubeconfig // Required
+    tkgm_kubeconfig_raw = var.kubeconfig                                        // Required
     tkgm_description    = "optional description about the kube-config provided" // Optional
   }
 
diff --git a/examples/resources/provisioner/provisioner_resource.tf b/examples/resources/provisioner/provisioner_resource.tf
@@ -1,7 +1,7 @@
 # Create provisioner resource
 resource "tanzu-mission-control_provisioner" "create_provisioner" {
-  name = "demo-test" # Required
-  management_cluster = "eks" # Required
+  name               = "demo-test" # Required
+  management_cluster = "eks"       # Required
 
   meta {
     description = "Create provisioner through terraform"
diff --git a/examples/usecases/custom_policy_with_custom_template_usecase.tf b/examples/usecases/custom_policy_with_custom_template_usecase.tf
@@ -104,7 +104,7 @@ resource "tanzu-mission-control_custom_policy" "cluster_group_scoped_custom_temp
     input {
       custom {
         template_name = tanzu-mission-control_custom_policy_template.sample_template.name
-        audit = false
+        audit         = false
 
         target_kubernetes_resources {
           api_groups = [
diff --git a/internal/resources/tanzupackageinstall/spec/spec_flatten_test.go b/internal/resources/tanzupackageinstall/spec/spec_flatten_test.go
@@ -59,6 +59,10 @@ func TestFlattenSpecForClusterScope(t *testing.T) {
 						"namespace": "cert-manager",
 						"some":      "91",
 					},
+					PathToInlineValuesKey: map[string]interface{}{
+						"namespace": "cert-manager",
+						"some":      91,
+					},
 				},
 			},
 		},
diff --git a/resource_templates/data_protection_feature.tf b/resource_templates/data_protection_feature.tf
@@ -1,7 +1,7 @@
 // Tanzu Mission Control Data Protection Feature
 
 locals {
-  cluster_name = "<cluster-name>"
+  cluster_name            = "<cluster-name>"
   management_cluster_name = "<management-cluster-name>"
   provisioner_name        = "<provisioner-name>"
 }
@@ -30,11 +30,11 @@ resource "tanzu-mission-control_enable_data_protection" "data_protection" {
 // Create Target Location for Scheduled Back Up
 // Self managed AWS Target Location
 resource "tanzu-mission-control_target_location" "aws_self_provisioned" {
-  name          = "<target-location-name>"
+  name = "<target-location-name>"
 
   spec {
     target_provider = "AWS"
-    credential      = {
+    credential = {
       name = "<aws-credential-name?"
     }
 
@@ -63,7 +63,7 @@ resource "tanzu-mission-control_target_location" "aws_self_provisioned" {
 
 // Create Full Cluster Scheduled Back Up
 resource "tanzu-mission-control_backup_schedule" "backup_full_cluster" {
-  name                    = "<scheduled-backup-name>"
+  name = "<scheduled-backup-name>"
   scope {
     cluster {
       cluster_name            = local.cluster_name
@@ -80,7 +80,7 @@ resource "tanzu-mission-control_backup_schedule" "backup_full_cluster" {
     }
 
     template {
-      backup_ttl          = "2592000s"
+      backup_ttl = "2592000s"
       excluded_namespaces = [
         "<namespace-1>",
       ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Read Tanzu Mission Control management cluster registration : fetch management cluster registration details`
`2`	`2`	`data "tanzu-mission-control_management_cluster" "read_management_cluster_registration" {`
`3`		`- name = "default" # Required`
	`3`	`+ name = "default" # Required`
`4`	`4`	`org_id = "<ID of Organization>" # Optional value`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`# Read Tanzu Mission Control provisioner : fetch the given provisioner details`
`2`	`2`	`data "tanzu-mission-control_provisioner" "read_provisioner" {`
`3`	`3`	`provisioners {`
`4`		`- name = "test-provisioner" # Optional`
`5`		`- management_cluster = "eks" # Required`
	`4`	`+ name = "test-provisioner" # Optional`
	`5`	`+ management_cluster = "eks" # Required`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`resource "tanzu-mission-control_enable_data_protection" "cgdemo" {`
`2`	`2`	`scope {`
`3`	`3`	`cluster_group {`
`4`		`- cluster_group_name = "default"`
	`4`	`+ cluster_group_name = "default"`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`
`@@ -11,21 +11,21 @@ resource "tanzu-mission-control_enable_data_protection" "cgdemo" {`
`11`	`11`	`enable_all_api_group_versions_backup = false`
`12`	`12`
`13`	`13`	`selector {`
`14`		`- labelselector {`
`15`		`- matchexpressions {`
`16`		`- key = "site"`
`17`		`- operator = "NotIn"`
`18`		`- values = [`
`19`		`- "one",`
`20`		`- "two"`
`21`		`- ]`
`22`		`- }`
	`14`	`+ labelselector {`
	`15`	`+ matchexpressions {`
	`16`	`+ key = "site"`
	`17`	`+ operator = "NotIn"`
	`18`	`+ values = [`
	`19`	`+ "one",`
	`20`	`+ "two"`
	`21`	`+ ]`
`23`	`22`	`}`
	`23`	`+ }`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`deletion_policy {`
`28`	`28`	`delete_backups = false`
`29`		`- force = true`
	`29`	`+ force = true`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ resource "tanzu-mission-control_ekscluster" "tf_eks_cluster" {`
`54`	`54`	`vpc_cni_config {`
`55`	`55`	`eni_config {`
`56`	`56`	`id = "subnet-0a680171b6330619f" // Required, need not belong to the same VPC as the cluster, subnets provided in vpc_cni_config are expected to be in different AZs`
`57`		`- security_groups = [ //optional, if not provided, the cluster security group will be used`
	`57`	`+ security_groups = [ //optional, if not provided, the cluster security group will be used`
`58`	`58`	`"sg-00c96ad9d02a22522",`
`59`	`59`	`]`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra`
`2`	`2`	`name = "tf-registration-test" // Required`
`3`	`3`
`4`	`4`	`spec {`
`5`		`- cluster_group = "default" // Required`
	`5`	`+ cluster_group = "default" // Required`
`6`	`6`	`kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra`
`2`	`2`	`name = "tf-registration-test" // Required`
`3`	`3`
`4`	`4`	`spec {`
`5`		`- cluster_group = "default" // Required`
	`5`	`+ cluster_group = "default" // Required`
`6`	`6`	`kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required`
`7`		`- management_proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC`
`8`		`- managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty`
	`7`	`+ management_proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC`
	`8`	`+ managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra`
`2`	`2`	`name = "tf-registration-test" // Required`
`3`	`3`
`4`	`4`	`spec {`
`5`		`- cluster_group = "default" // Required`
	`5`	`+ cluster_group = "default" // Required`
`6`	`6`	`kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`register_management_cluster {`
`10`		`- tkgm_kubeconfig_file = "<kube-config-path>" // Required`
`11`		`- tkgm_description = "optional description about the kube-config provided" // Optional`
	`10`	`+ tkgm_kubeconfig_file = "<kube-config-path>" // Required`
	`11`	`+ tkgm_description = "optional description about the kube-config provided" // Optional`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`ready_wait_timeout = "15m" // Optional , default value is 15m`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra`
`2`	`2`	`name = "tf-registration-test" // Required`
`3`	`3`
`4`	`4`	`spec {`
`5`		`- cluster_group = "default" // Required`
	`5`	`+ cluster_group = "default" // Required`
`6`	`6`	`kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`register_management_cluster {`
`10`		`- tkgm_kubeconfig_raw = var.kubeconfig // Required`
	`10`	`+ tkgm_kubeconfig_raw = var.kubeconfig // Required`
`11`	`11`	`tkgm_description = "optional description about the kube-config provided" // Optional`
`12`	`12`	`}`
`13`	`13`