Update LDE Node Pool Assertion and Test env variable Handling (#673)

* better test env var handling

* update test assertion

* add safety

* update assertion

Author: ykim-akamai

Makefile

@@ -122,9 +122,9 @@ else
 	exit 1;
 endif
 	@echo "ua_prefix: E2E" >> $(INTEGRATION_CONFIG)
-	@echo "api_url: $(TEST_API_URL)" >> $(INTEGRATION_CONFIG)
-	@echo "api_version: $(TEST_API_VERSION)" >> $(INTEGRATION_CONFIG)
-	@echo "ca_file: $(TEST_API_CA)" >> $(INTEGRATION_CONFIG)
+	@echo "api_url: $$(url=$${LINODE_API_URL:-$${TEST_API_URL:-https://api.linode.com}}; echo $${url%/}/)" >> $(INTEGRATION_CONFIG)
+	@echo "api_version: $${LINODE_API_VERSION:-$${TEST_API_VERSION:-v4beta}}" >> $(INTEGRATION_CONFIG)
+	@echo "ca_file: $${LINODE_CA:-$${TEST_API_CA}}" >> $(INTEGRATION_CONFIG)
 
 inject:
 	@echo "Injecting documentation into source files"

e2e_scripts

@@ -179,7 +179,7 @@
           - info_by_label.node_pools[0].count == 1
           - info_by_label.node_pools[0].id == create_cluster.node_pools[0].id
 
-    - name: Create a Linode LKE cluster with a pool with disk encryption enabled
+    - name: Create a Linode LKE cluster with a pool has disk encryption explicitly set
       linode.cloud.lke_cluster:
         label: 'ansible-test-de-{{ r }}'
         region: '{{ lde_region }}'
@@ -194,7 +194,7 @@
     - name: Assert LKE cluster is created
       assert:
         that:
-          - create_cluster_disk_encryption.node_pools[0].disk_encryption == 'disabled'
+          - create_cluster_disk_encryption.node_pools[0].disk_encryption in ['enabled', 'disabled']
 
   always:
     - ignore_errors: yes

tests/integration/targets/lke_cluster_basic/tasks/main.yaml

@@ -148,7 +148,7 @@
         that:
           - new_pool_de.node_pool.count == 2
           - new_pool_de.node_pool.type == 'g6-standard-1'
-          - new_pool_de.node_pool.disk_encryption == 'disabled'
+          - new_pool_de.node_pool.disk_encryption in ['enabled', 'disabled']
           - new_pool_de.node_pool.nodes[0].status == 'ready'
           - new_pool_de.node_pool.nodes[1].status == 'ready'